r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[samba.git] / source3 / lib / debug.c

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 01aedb47740ec5fa1987ecb6a31a7fbe6aff5d02..b69a35ecd5c829f93cd8646f5f732604d7185e2c 100644 (file)
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -192,7 +192,7 @@ static char *debug_list_class_names_and_levels(void)
        if (DEBUGLEVEL_CLASS == &debug_all_class_hack)
                return NULL;
 
-       list = calloc(debug_num_classes + 1, sizeof(char *));
+       list = SMB_CALLOC_ARRAY(char *, debug_num_classes + 1);
        if (!list)
                return NULL;
 
@@ -210,7 +210,7 @@ static char *debug_list_class_names_and_levels(void)
        }
 
        /* create single string list - add space for newline */
-       b = buf = malloc(dim+1);
+       b = buf = SMB_MALLOC(dim+1);
        if (!buf) {
                err = True;
                goto done;
@@ -292,7 +292,7 @@ int debug_add_class(const char *classname)
                /* Initial loading... */
                new_ptr = NULL;
        }
-       new_ptr = Realloc(new_ptr, sizeof(int) * (debug_num_classes + 1));
+       new_ptr = SMB_REALLOC_ARRAY(new_ptr, int, debug_num_classes + 1);
        if (!new_ptr)
                return -1;
        DEBUGLEVEL_CLASS = new_ptr;
@@ -309,19 +309,18 @@ int debug_add_class(const char *classname)
        if (new_ptr == &debug_all_class_isset_hack) {
                new_ptr = NULL;
        }
-       new_ptr = Realloc(new_ptr, sizeof(BOOL) * (debug_num_classes + 1));
+       new_ptr = SMB_REALLOC_ARRAY(new_ptr, BOOL, debug_num_classes + 1);
        if (!new_ptr)
                return -1;
        DEBUGLEVEL_CLASS_ISSET = new_ptr;
        DEBUGLEVEL_CLASS_ISSET[ndx] = False;
 
-       new_ptr = Realloc(classname_table,
-                         sizeof(char *) * (debug_num_classes + 1));
+       new_ptr = SMB_REALLOC_ARRAY(classname_table, char *, debug_num_classes + 1);
        if (!new_ptr)
                return -1;
        classname_table = new_ptr;
 
-       classname_table[ndx] = strdup(classname);
+       classname_table[ndx] = SMB_STRDUP(classname);
        if (! classname_table[ndx])
                return -1;