-/*
- * Copyright (C) 1994-2004, Index Data
- * All rights reserved.
- *
- * $Id: xmalloc.c,v 1.3 2004-11-18 15:18:14 heikki Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
*/
/**
* \file xmalloc.c
#include <stdlib.h>
#include <string.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
#ifndef TRACE_XMALLOC
}
if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+16*sizeof(char))))
- return 0;
+ return 0;
dinfo = (struct dmalloc_info *) res;
strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dinfo->next)
- dinfo->next->prev = dinfo;
+ dinfo->next->prev = dinfo;
dmalloc_list = dinfo;
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
struct dmalloc_info *dinfo;
if (!ptr)
- return;
+ return;
dinfo = (struct dmalloc_info *)
- ((char*)ptr - 8*sizeof(char) - sizeof(*dinfo));
+ ((char*)ptr - 8*sizeof(char) - sizeof(*dinfo));
if (memcmp(head, (char*) ptr - 8*sizeof(char), 8*sizeof(char)))
{
- yaz_log(YLOG_FATAL, "xfree_d bad head, %s:%d, %p", file, line, ptr);
+ yaz_log(YLOG_FATAL, "xfree_d bad head, %s:%d, %p", file, line, ptr);
abort();
}
if (memcmp((char*) ptr + dinfo->len, tail, 8*sizeof(char)))
{
- yaz_log(YLOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
+ yaz_log(YLOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
abort();
}
if (dinfo->prev)
- dinfo->prev->next = dinfo->next;
+ dinfo->prev->next = dinfo->next;
else
- dmalloc_list = dinfo->next;
+ dmalloc_list = dinfo->next;
if (dinfo->next)
- dinfo->next->prev = dinfo->prev;
+ dinfo->next->prev = dinfo->prev;
memcpy ((char*) ptr - 8*sizeof(char), freed, 8*sizeof(char));
free(dinfo);
return;
if (!ptr)
{
- if (!nbytes)
- return 0;
- res = (char *) malloc(nbytes + sizeof(*dinfo) + 16*sizeof(char));
+ if (!nbytes)
+ return 0;
+ res = (char *) malloc(nbytes + sizeof(*dinfo) + 16*sizeof(char));
}
else
{
- if (memcmp(head, ptr - 8*sizeof(char), 8*sizeof(char)))
- {
- yaz_log(YLOG_FATAL, "xrealloc_d bad head, %s:%d, %p",
- file, line, ptr);
- abort();
- }
- dinfo = (struct dmalloc_info *) (ptr-8*sizeof(char) - sizeof(*dinfo));
- if (memcmp(ptr + dinfo->len, tail, 8*sizeof(char)))
- {
- yaz_log(YLOG_FATAL, "xrealloc_d bad tail, %s:%d, %p",
- file, line, ptr);
- abort();
- }
- if (dinfo->prev)
- dinfo->prev->next = dinfo->next;
- else
- dmalloc_list = dinfo->next;
- if (dinfo->next)
- dinfo->next->prev = dinfo->prev;
-
- if (!nbytes)
- {
- free (dinfo);
- return 0;
- }
- res = (char *)
- realloc(dinfo, nbytes + sizeof(*dinfo) + 16*sizeof(char));
+ if (memcmp(head, ptr - 8*sizeof(char), 8*sizeof(char)))
+ {
+ yaz_log(YLOG_FATAL, "xrealloc_d bad head, %s:%d, %p",
+ file, line, ptr);
+ abort();
+ }
+ dinfo = (struct dmalloc_info *) (ptr-8*sizeof(char) - sizeof(*dinfo));
+ if (memcmp(ptr + dinfo->len, tail, 8*sizeof(char)))
+ {
+ yaz_log(YLOG_FATAL, "xrealloc_d bad tail, %s:%d, %p",
+ file, line, ptr);
+ abort();
+ }
+ if (dinfo->prev)
+ dinfo->prev->next = dinfo->next;
+ else
+ dmalloc_list = dinfo->next;
+ if (dinfo->next)
+ dinfo->next->prev = dinfo->prev;
+
+ if (!nbytes)
+ {
+ free (dinfo);
+ return 0;
+ }
+ res = (char *)
+ realloc(dinfo, nbytes + sizeof(*dinfo) + 16*sizeof(char));
}
if (!res)
- return 0;
+ return 0;
dinfo = (struct dmalloc_info *) res;
strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dmalloc_list)
- dmalloc_list->prev = dinfo;
+ dmalloc_list->prev = dinfo;
dmalloc_list = dinfo;
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
}
if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+16*sizeof(char))))
- return 0;
+ return 0;
dinfo = (struct dmalloc_info *) res;
strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dinfo->next)
- dinfo->next->prev = dinfo;
+ dinfo->next->prev = dinfo;
dmalloc_list = dinfo;
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
yaz_log (log_level, "malloc_trav %s:%d", file, line);
while (dinfo)
{
- yaz_log (log_level, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
- ((char*) dinfo)+sizeof(*dinfo)+8*sizeof(char), dinfo->len);
- size += dinfo->len;
- dinfo = dinfo->next;
+ yaz_log (log_level, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
+ ((char*) dinfo)+sizeof(*dinfo)+8*sizeof(char), dinfo->len);
+ size += dinfo->len;
+ dinfo = dinfo->next;
}
yaz_log (log_level, "total bytes %ld", (long) size);
}
xmalloc_trav_d(file, line);
}
+void xmalloc_fatal(void)
+{
+ exit(1);
+}
+
void *xrealloc_f (void *o, size_t size, const char *file, int line)
{
void *p = xrealloc_d (o, size, file, line);
if(log_level)
yaz_log (log_level,
- "%s:%d: xrealloc(s=%d) %p -> %p", file, line, size, o, p);
+ "%s:%d: xrealloc(s=%ld) %p -> %p", file, line, (long) size, o, p);
if (!p)
{
- yaz_log (YLOG_FATAL|YLOG_ERRNO, "Out of memory, realloc (%d bytes)",
- size);
- exit(1);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "Out of memory, realloc (%ld bytes)",
+ (long) size);
+ xmalloc_fatal();
}
return p;
}
}
if (log_level)
- yaz_log (log_level, "%s:%d: xmalloc(s=%d) %p", file, line, size, p);
+ yaz_log (log_level, "%s:%d: xmalloc(s=%ld) %p", file, line,
+ (long) size, p);
if (!p)
{
- yaz_log (YLOG_FATAL, "Out of memory - malloc (%d bytes)", size);
- exit (1);
+ yaz_log (YLOG_FATAL, "Out of memory - malloc (%ld bytes)",
+ (long) size);
+ xmalloc_fatal();
}
return p;
}
}
if (log_level)
- yaz_log (log_level, "%s:%d: xcalloc(s=%d) %p", file, line, size, p);
+ yaz_log (log_level, "%s:%d: xcalloc(s=%ld) %p", file, line,
+ (long) size, p);
if (!p)
{
- yaz_log (YLOG_FATAL, "Out of memory - calloc (%d, %d)", nmemb, size);
- exit (1);
+ yaz_log (YLOG_FATAL, "Out of memory - calloc (%ld, %ld)",
+ (long) nmemb, (long) size);
+ xmalloc_fatal();
}
return p;
}
}
if (log_level)
- yaz_log (log_level, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p);
+ yaz_log (log_level, "%s:%d: xstrdup(s=%ld) %p", file, line,
+ (long) strlen(s)+1, p);
strcpy (p, s);
return p;
yaz_log (log_level, "%s:%d: xfree %p", file, line, p);
xfree_d(p, file, line);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+