X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fxmalloc.c;h=b49d399d450ca23da3be708c51549756da1bae5d;hp=8ef1d8fd415a6fb6e7a9c737fb2340a733eb0764;hb=2715f6522ca62ab5dbc886c21ed18945743216f0;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/src/xmalloc.c b/src/xmalloc.c
index 8ef1d8f..b49d399 100644
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: xmalloc.c,v 1.9 2007-01-03 08:42:15 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
+ * See the file LICENSE for details.
  */
 /**
  * \file xmalloc.c
@@ -24,8 +22,8 @@
 #define TRACE_XMALLOC 1
 #endif
 
-static int log_level=0;
-static int log_level_initialized=0;
+static int log_level = 0;
+static int log_level_initialized = 0;
 
 #if TRACE_XMALLOC > 1
 
@@ -51,14 +49,14 @@ void *xmalloc_d(size_t nbytes, const char *file, int line)
     
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+16*sizeof(char))))
         return 0;
     dinfo = (struct dmalloc_info *) res;
-    strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
+    strncpy(dinfo->file, file, sizeof(dinfo->file)-1);
     dinfo->file[sizeof(dinfo->file)-1] = '\0';
     dinfo->line = line;
     dinfo->len = nbytes;
@@ -99,7 +97,7 @@ void xfree_d(void *ptr, const char *file, int line)
         dmalloc_list = dinfo->next;
     if (dinfo->next)
         dinfo->next->prev = dinfo->prev;
-    memcpy ((char*) ptr - 8*sizeof(char), freed, 8*sizeof(char));
+    memcpy((char*) ptr - 8*sizeof(char), freed, 8*sizeof(char));
     free(dinfo);
     return;
 }
@@ -112,8 +110,8 @@ void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
     
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     if (!ptr)
@@ -146,7 +144,7 @@ void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
         
         if (!nbytes)
         {
-            free (dinfo);
+            free(dinfo);
             return 0;
         }
         res = (char *)
@@ -155,7 +153,7 @@ void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
     if (!res)
         return 0;
     dinfo = (struct dmalloc_info *) res;
-    strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
+    strncpy(dinfo->file, file, sizeof(dinfo->file)-1);
     dinfo->file[sizeof(dinfo->file)-1] = '\0';
     dinfo->line = line;
     dinfo->len = nbytes;
@@ -180,14 +178,14 @@ void *xcalloc_d(size_t nmemb, size_t size, const char *file, int line)
     
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+16*sizeof(char))))
         return 0;
     dinfo = (struct dmalloc_info *) res;
-    strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
+    strncpy(dinfo->file, file, sizeof(dinfo->file)-1);
     dinfo->file[sizeof(dinfo->file)-1] = '\0';
     dinfo->line = line;
     dinfo->len = nbytes;
@@ -211,19 +209,19 @@ void xmalloc_trav_d(const char *file, int line)
     
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
-    yaz_log (log_level, "malloc_trav %s:%d", file, line);
+    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);
+        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);
+    yaz_log(log_level, "total bytes %ld", (long) size);
 }
 
 #else
@@ -239,8 +237,8 @@ void xmalloc_trav_f(const char *s, const char *file, int line)
 {
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     xmalloc_trav_d(file, line);
@@ -251,87 +249,87 @@ void xmalloc_fatal(void)
     exit(1);
 }
 
-void *xrealloc_f (void *o, size_t size, const char *file, int line)
+void *xrealloc_f(void *o, size_t size, const char *file, int line)
 {
-    void *p = xrealloc_d (o, size, file, line);
+    void *p = xrealloc_d(o, size, file, line);
 
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
-    if(log_level)
-        yaz_log (log_level,
-            "%s:%d: xrealloc(s=%ld) %p -> %p", file, line, (long) size, o, p);
+    if (log_level)
+        yaz_log(log_level,
+                "%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 (%ld bytes)",
-                 (long) size);
+        yaz_log(YLOG_FATAL|YLOG_ERRNO, "Out of memory, realloc (%ld bytes)",
+                (long) size);
         xmalloc_fatal();
     }
     return p;
 }
 
-void *xmalloc_f (size_t size, const char *file, int line)
+void *xmalloc_f(size_t size, const char *file, int line)
 {
-    void *p = xmalloc_d (size, file, line);
+    void *p = xmalloc_d(size, file, line);
     
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     if (log_level)
-        yaz_log (log_level, "%s:%d: xmalloc(s=%ld) %p", file, line, 
-                 (long) 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 (%ld bytes)",
-                 (long) size);
+        yaz_log(YLOG_FATAL, "Out of memory - malloc (%ld bytes)",
+                (long) size);
         xmalloc_fatal();
     }
     return p;
 }
 
-void *xcalloc_f (size_t nmemb, size_t size, const char *file, int line)
+void *xcalloc_f(size_t nmemb, size_t size, const char *file, int line)
 {
-    void *p = xcalloc_d (nmemb, size, file, line);
+    void *p = xcalloc_d(nmemb, size, file, line);
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     if (log_level)
-        yaz_log (log_level, "%s:%d: xcalloc(s=%ld) %p", file, line,
-                 (long) 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 (%ld, %ld)",
-                 (long) nmemb, (long) size);
+        yaz_log(YLOG_FATAL, "Out of memory - calloc (%ld, %ld)",
+                (long) nmemb, (long) size);
         xmalloc_fatal();
     }
     return p;
 }
 
-char *xstrdup_f (const char *s, const char *file, int line)
+char *xstrdup_f(const char *s, const char *file, int line)
 {
-    char *p = (char *)xmalloc_d (strlen(s)+1, file, line);
+    char *p = (char *)xmalloc_d(strlen(s)+1, file, line);
     if (!log_level_initialized)
     {
-        log_level=yaz_log_module_level("malloc");
-        log_level_initialized=1;
+        log_level = yaz_log_module_level("malloc");
+        log_level_initialized = 1;
     }
 
     if (log_level)
-        yaz_log (log_level, "%s:%d: xstrdup(s=%ld) %p", file, line, 
-                 (long) strlen(s)+1, p);
+        yaz_log(log_level, "%s:%d: xstrdup(s=%ld) %p", file, line, 
+                (long) strlen(s)+1, p);
 
-    strcpy (p, s);
+    strcpy(p, s);
     return p;
 }
 
@@ -340,12 +338,27 @@ void xfree_f(void *p, const char *file, int line)
     if (!p)
         return ;
     if (log_level)
-        yaz_log (log_level, "%s:%d: xfree %p", file, line, p);
+        yaz_log(log_level, "%s:%d: xfree %p", file, line, p);
     xfree_d(p, file, line);
 }
+
+char *xstrndup_f(const char *s, size_t n, const char *file, int line)
+{
+    size_t l = strlen(s);
+    if (l < n)
+        return xstrdup_f(s, file, line);
+    {
+        char *a = (char*) xmalloc_f(n+1, file, line);
+        memcpy(a, s, n);
+        a[n] = '\0';
+        return a;
+    } 
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab