diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/charset.c | 7 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 2 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_winsserver.c | 10 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_workgroupdb.c | 24 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 8 |
5 files changed, 30 insertions, 21 deletions
diff --git a/source3/lib/charset.c b/source3/lib/charset.c index db331af115..5e9481f9bb 100644 --- a/source3/lib/charset.c +++ b/source3/lib/charset.c @@ -127,9 +127,10 @@ static void add_dos_char(int lower, BOOL map_lower_to_upper, { lower &= 0xff; upper &= 0xff; - DEBUG(6,("Adding chars 0x%x 0x%x (l->u = %s) (u->l = %s)\n",lower,upper, - map_lower_to_upper ? "True" : "False", - map_upper_to_lower ? "True" : "False")); + DEBUGADD( 6, ( "Adding chars 0x%x 0x%x (l->u = %s) (u->l = %s)\n", + lower, upper, + map_lower_to_upper ? "True" : "False", + map_upper_to_lower ? "True" : "False" ) ); if (lower) dos_char_map[lower] = 1; if (upper) dos_char_map[upper] = 1; lower_char_map[lower] = (char)lower; /* Define tolower(lower) */ diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index af12911e7e..567f7bbca7 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -515,7 +515,7 @@ static BOOL init_structs(void) DEBUG( 5, ("Netbios name list:-\n") ); for( n=0; my_netbios_names[n]; n++ ) - DEBUG( 5, ( "my_netbios_names[%d]=\"%s\"\n", n, my_netbios_names[n] ) ); + DEBUGADD( 5, ( "my_netbios_names[%d]=\"%s\"\n", n, my_netbios_names[n] ) ); return( True ); } /* init_structs */ diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index f663362706..dfa52a65f8 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -1570,19 +1570,19 @@ void wins_write_database(void) int i; struct tm *tm; - DEBUG(4,("%-19s ", namestr(&namerec->name) )); + DEBUGADD(4,("%-19s ", namestr(&namerec->name) )); if( namerec->data.death_time != PERMANENT_TTL ) { tm = LocalTime(&namerec->data.death_time); - DEBUG(4,("TTL = %s", asctime(tm) )); + DEBUGADD(4,("TTL = %s", asctime(tm) )); } else - DEBUG(4,("TTL = PERMANENT\t")); + DEBUGADD(4,("TTL = PERMANENT\t")); for (i = 0; i < namerec->data.num_ips; i++) - DEBUG(4,("%15s ", inet_ntoa(namerec->data.ip[i]) )); - DEBUG(4,("%2x\n", namerec->data.nb_flags )); + DEBUGADD(4,("%15s ", inet_ntoa(namerec->data.ip[i]) )); + DEBUGADD(4,("%2x\n", namerec->data.nb_flags )); if( namerec->data.source == REGISTER_NAME ) { diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c index 51b2519d83..0b0b724854 100644 --- a/source3/nmbd/nmbd_workgroupdb.c +++ b/source3/nmbd/nmbd_workgroupdb.c @@ -303,22 +303,30 @@ void dump_workgroups(BOOL force_write) if (subrec->workgrouplist) { struct work_record *work; - - DEBUG(debuglevel,("dump_workgroups: dump workgroup on subnet %15s: ", subrec->subnet_name)); - DEBUG(debuglevel,(" netmask=%15s:\n", inet_ntoa(subrec->mask_ip))); + + if( DEBUGLVL( debuglevel ) ) + { + dbgtext( "dump_workgroups()\n " ); + dbgtext( "dump workgroup on subnet %15s: ", subrec->subnet_name ); + dbgtext( "netmask=%15s:\n", inet_ntoa(subrec->mask_ip) ); + } for (work = subrec->workgrouplist; work; work = work->next) { - DEBUG(debuglevel,("\t%s(%d) current master browser = %s\n", work->work_group, - work->token, - *work->local_master_browser_name ? work->local_master_browser_name : "UNKNOWN" )); + DEBUGADD( debuglevel, ( "\t%s(%d) current master browser = %s\n", + work->work_group, + work->token, + *work->local_master_browser_name + ? work->local_master_browser_name : "UNKNOWN" ) ); if (work->serverlist) { struct server_record *servrec; for (servrec = work->serverlist; servrec; servrec = servrec->next) { - DEBUG(debuglevel,("\t\t%s %8x (%s)\n", - servrec->serv.name, servrec->serv.type, servrec->serv.comment)); + DEBUGADD( debuglevel, ( "\t\t%s %8x (%s)\n", + servrec->serv.name, + servrec->serv.type, + servrec->serv.comment ) ); } } } diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ce8ff7122d..008f4e4539 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1710,17 +1710,17 @@ BOOL lp_file_list_changed(void) pstrcpy(n2,f->name); standard_sub_basic(n2); - DEBUG(6,("file %s -> %s last mod_time: %s\n", - f->name, n2, ctime(&f->modtime))); + DEBUGADD( 6, ( "file %s -> %s last mod_time: %s\n", + f->name, n2, ctime(&f->modtime) ) ); mod_time = file_modtime(n2); if (f->modtime != mod_time) { - DEBUG(6,("file %s modified: %s\n", n2, ctime(&mod_time))); + DEBUGADD(6,("file %s modified: %s\n", n2, ctime(&mod_time))); f->modtime = mod_time; return(True); } - f = f->next; + f = f->next; } return(False); } |