From 85d3b74844453bcfa0bb46f1c28aab2ae40d0d39 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 14 Mar 2006 20:37:24 +0000 Subject: r14397: Fix deadcode in coverity error #1. Jeremy. (This used to be commit 4a4953c4d27cd1e925c9afe24fa49b015ce033ec) --- source3/lib/debug.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/debug.c b/source3/lib/debug.c index f3676070dc..29d879adbc 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -191,12 +191,14 @@ static char *debug_list_class_names_and_levels(void) char *b; BOOL err = False; - if (DEBUGLEVEL_CLASS == &debug_all_class_hack) + if (DEBUGLEVEL_CLASS == &debug_all_class_hack) { return NULL; + } list = SMB_CALLOC_ARRAY(char *, debug_num_classes + 1); - if (!list) + if (!list) { return NULL; + } /* prepare strings */ for (i = 0, dim = 0; i < debug_num_classes; i++) { @@ -227,13 +229,12 @@ static char *debug_list_class_names_and_levels(void) done: /* free strings list */ - for (i = 0; i < debug_num_classes; i++) - if (list[i]) free(list[i]); - free(list); + for (i = 0; i < debug_num_classes; i++) { + SAFE_FREE(list[i]); + } + SAFE_FREE(list); if (err) { - if (buf) - free(buf); return NULL; } else { return buf; -- cgit