Commit 3a70c8db authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

dmemory: cleanup

parent a79be7d1
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.6.4rc1.
# Generated by GNU Autoconf 2.68 for cdi 1.6.4rc2.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.6.4rc1'
PACKAGE_STRING='cdi 1.6.4rc1'
PACKAGE_VERSION='1.6.4rc2'
PACKAGE_STRING='cdi 1.6.4rc2'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
 
......@@ -1442,7 +1442,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.6.4rc1 to adapt to many kinds of systems.
\`configure' configures cdi 1.6.4rc2 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1512,7 +1512,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.6.4rc1:";;
short | recursive ) echo "Configuration of cdi 1.6.4rc2:";;
esac
cat <<\_ACEOF
 
......@@ -1699,7 +1699,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.6.4rc1
cdi configure 1.6.4rc2
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2460,7 +2460,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by cdi $as_me 1.6.4rc1, which was
It was created by cdi $as_me 1.6.4rc2, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3405,7 +3405,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.6.4rc1'
VERSION='1.6.4rc2'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -28417,7 +28417,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi $as_me 1.6.4rc1, which was
This file was extended by cdi $as_me 1.6.4rc2, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -28483,7 +28483,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cdi config.status 1.6.4rc1
cdi config.status 1.6.4rc2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
......@@ -4,7 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdi], [1.6.4rc1], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.6.4rc2], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
......@@ -69,7 +69,7 @@ static
void memInternalProblem(const char *caller, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
printf("\n");
......@@ -89,9 +89,8 @@ void memError(const char *caller, const char *file, int line, size_t size)
fprintf(stderr, "Error (%s) : Allocation of %lu bytes failed. [ line %d file %s ]\n",
caller, (unsigned long) size, line, file);
if ( errno )
perror("System error message ");
if ( errno ) perror("System error message ");
exit(EXIT_FAILURE);
}
......@@ -122,9 +121,9 @@ void memListPrintEntry(int mtype, int item, size_t size, void *ptr,
{
fprintf(stderr, " line %4d", line);
fprintf(stderr, " file %s", file);
}
}
if ( caller != NULL )
fprintf(stderr, " (%s)", caller);
fprintf(stderr, " (%s)", caller);
fprintf(stderr, "]\n");
}
......@@ -213,7 +212,7 @@ void memInit(void)
{
memGetDebugLevel();
initDebugLevel = 1;
}
}
}
static
......@@ -311,7 +310,7 @@ int memListNewEntry(int mtype, void *ptr, size_t size, size_t nobj,
{
len = strlen(file);
if ( len > MAXNAME-1 ) len = MAXNAME-1;
(void) memcpy(memTable[memID].file, file, len);
memTable[memID].file[len] = '\0';
}
......@@ -367,7 +366,7 @@ int memListChangeEntry(void *ptrold, void *ptr, size_t size,
item = memTable[memID].item;
sizeold = memTable[memID].size*memTable[memID].nobj;
memTable[memID].ptr = ptr;
memTable[memID].size = size;
memTable[memID].nobj = 1;
......@@ -424,8 +423,7 @@ void *Calloc(const char *caller, const char *file, int line, size_t nobjs, size_
{
memAccess++;
if ( ptr )
item = memListNewEntry(CALLOC_FUNC, ptr, size, nobjs, caller, file, line);
if ( ptr ) item = memListNewEntry(CALLOC_FUNC, ptr, size, nobjs, caller, file, line);
memListPrintEntry(CALLOC_FUNC, item, size*nobjs, ptr, caller, file, line);
}
......@@ -455,8 +453,7 @@ void *Malloc(const char *caller, const char *file, int line, size_t size)
{
memAccess++;
if ( ptr )
item = memListNewEntry(MALLOC_FUNC, ptr, size, 1, caller, file, line);
if ( ptr ) item = memListNewEntry(MALLOC_FUNC, ptr, size, 1, caller, file, line);
memListPrintEntry(MALLOC_FUNC, item, size, ptr, caller, file, line);
}
......@@ -490,8 +487,7 @@ void *Realloc(const char *caller, const char *file, int line, void *ptrold, size
{
item = memListChangeEntry(ptrold, ptr, size, caller, file, line);
if ( item == UNDEFID )
item = memListNewEntry(REALLOC_FUNC, ptr, size, 1, caller, file, line);
if ( item == UNDEFID ) item = memListNewEntry(REALLOC_FUNC, ptr, size, 1, caller, file, line);
}
memListPrintEntry(REALLOC_FUNC, item, size, ptr, caller, file, line);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment