From dfc517b05395d925a4d7b1ce9633a849f9468e70 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 23 Feb 2006 15:52:24 +0000 Subject: r13658: More moving around of files: - Collect the generic utility functions into a lib/util/ (a la GLib is for the GNOME folks) - Remove even more files from include/ (This used to be commit ba62880f5b05c2a505dc7f54676b231197a7e707) --- source4/lib/util/debug.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 source4/lib/util/debug.c (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c new file mode 100644 index 0000000000..9df6e573b0 --- /dev/null +++ b/source4/lib/util/debug.c @@ -0,0 +1,205 @@ +/* + Unix SMB/CIFS implementation. + Samba debug functions + Copyright (C) Andrew Tridgell 2003 + Copyright (C) James J Myers 2003 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" +#include "system/filesys.h" +#include "system/time.h" +#include "dynconfig.h" + +/* this global variable determines what messages are printed */ +int DEBUGLEVEL; + + +/* the registered mutex handlers */ +static struct { + const char *name; + struct debug_ops ops; +} debug_handlers; + +/* state variables for the debug system */ +static struct { + int fd; + enum debug_logtype logtype; + const char *prog_name; +} state; + +/* + the backend for debug messages. Note that the DEBUG() macro has already + ensured that the log level has been met before this is called +*/ +void do_debug_header(int level, const char *location, const char *func) +{ + log_timestring(level, location, func); + log_task_id(); +} + +/* + the backend for debug messages. Note that the DEBUG() macro has already + ensured that the log level has been met before this is called +*/ +void do_debug(const char *format, ...) +{ + va_list ap; + char *s = NULL; + + if (state.fd == 0) { + reopen_logs(); + } + + if (state.fd <= 0) return; + + va_start(ap, format); + vasprintf(&s, format, ap); + va_end(ap); + + write(state.fd, s, strlen(s)); + free(s); +} + +/* + reopen the log file (usually called because the log file name might have changed) +*/ +void reopen_logs(void) +{ + const char *logfile = lp_logfile(); + char *fname = NULL; + int old_fd = state.fd; + + switch (state.logtype) { + case DEBUG_STDOUT: + state.fd = 1; + break; + + case DEBUG_STDERR: + state.fd = 2; + break; + + case DEBUG_FILE: + if ((*logfile) == '/') { + fname = strdup(logfile); + } else { + asprintf(&fname, "%s/%s.log", dyn_LOGFILEBASE, state.prog_name); + } + if (fname) { + int newfd = open(fname, O_CREAT|O_APPEND|O_WRONLY, 0600); + if (newfd == -1) { + DEBUG(1, ("Failed to open new logfile: %s\n", fname)); + } else { + state.fd = newfd; + } + free(fname); + } else { + DEBUG(1, ("Failed to find name for file-based logfile!\n")); + } + + break; + } + + if (old_fd > 2) { + close(old_fd); + } +} + +/* + control the name of the logfile and whether logging will be to stdout, stderr + or a file +*/ +void setup_logging(const char *prog_name, enum debug_logtype new_logtype) +{ + if (state.logtype < new_logtype) { + state.logtype = new_logtype; + } + if (prog_name) { + state.prog_name = prog_name; + } + reopen_logs(); +} + +/* + return a string constant containing n tabs + no more than 10 tabs are returned +*/ +const char *do_debug_tab(uint_t n) +{ + const char *tabs[] = {"", "\t", "\t\t", "\t\t\t", "\t\t\t\t", "\t\t\t\t\t", + "\t\t\t\t\t\t", "\t\t\t\t\t\t\t", "\t\t\t\t\t\t\t\t", + "\t\t\t\t\t\t\t\t\t", "\t\t\t\t\t\t\t\t\t\t"}; + return tabs[MIN(n, 10)]; +} + + +/* + log/print suspicious usage - print comments and backtrace +*/ +void log_suspicious_usage(const char *from, const char *info) +{ + if (debug_handlers.ops.log_suspicious_usage) { + debug_handlers.ops.log_suspicious_usage(from, info); + } +} +void print_suspicious_usage(const char* from, const char* info) +{ + if (debug_handlers.ops.print_suspicious_usage) { + debug_handlers.ops.print_suspicious_usage(from, info); + } +} + +void log_timestring(int level, const char *location, const char *func) +{ + char *t = NULL; + char *s = NULL; + + if (state.logtype != DEBUG_FILE) return; + + t = timestring(NULL, time(NULL)); + if (!t) return; + + asprintf(&s, "[%s, %d %s:%s()]\n", t, level, location, func); + talloc_free(t); + if (!s) return; + + write(state.fd, s, strlen(s)); + free(s); +} + +uint32_t get_task_id(void) +{ + if (debug_handlers.ops.get_task_id) { + return debug_handlers.ops.get_task_id(); + } + return getpid(); +} + +void log_task_id(void) +{ + if (debug_handlers.ops.log_task_id) { + debug_handlers.ops.log_task_id(state.fd); + } +} + +/* + register a set of debug handlers. +*/ +void register_debug_handlers(const char *name, struct debug_ops *ops) +{ + debug_handlers.name = name; + debug_handlers.ops = *ops; +} -- cgit From aa04388943fe5d7d8c873a6ee8a4cc9af2491532 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 28 Feb 2006 13:12:39 +0000 Subject: r13752: Add doxyfile and fix formatting of comments. Current output is available at http://samba.org/~jelmer/util-api/ (This used to be commit 90812203df151a5e62394306827c72adfe13c63c) --- source4/lib/util/debug.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 9df6e573b0..3a71ed2df6 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -24,6 +24,11 @@ #include "system/time.h" #include "dynconfig.h" +/** + * @file + * @brief Debug logging + **/ + /* this global variable determines what messages are printed */ int DEBUGLEVEL; @@ -74,7 +79,7 @@ void do_debug(const char *format, ...) free(s); } -/* +/** reopen the log file (usually called because the log file name might have changed) */ void reopen_logs(void) @@ -118,7 +123,7 @@ void reopen_logs(void) } } -/* +/** control the name of the logfile and whether logging will be to stdout, stderr or a file */ @@ -133,7 +138,7 @@ void setup_logging(const char *prog_name, enum debug_logtype new_logtype) reopen_logs(); } -/* +/** return a string constant containing n tabs no more than 10 tabs are returned */ @@ -146,8 +151,8 @@ const char *do_debug_tab(uint_t n) } -/* - log/print suspicious usage - print comments and backtrace +/** + log suspicious usage - print comments and backtrace */ void log_suspicious_usage(const char *from, const char *info) { @@ -155,6 +160,12 @@ void log_suspicious_usage(const char *from, const char *info) debug_handlers.ops.log_suspicious_usage(from, info); } } + + +/** + print suspicious usage - print comments and backtrace +*/ + void print_suspicious_usage(const char* from, const char* info) { if (debug_handlers.ops.print_suspicious_usage) { @@ -195,7 +206,7 @@ void log_task_id(void) } } -/* +/** register a set of debug handlers. */ void register_debug_handlers(const char *name, struct debug_ops *ops) -- cgit From 685b824aa88a03a8b70507d5d2454a744468075a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 1 Mar 2006 15:02:07 +0000 Subject: r13770: - do fsync() on the debug fd, as we do in samba3, I have an report that smbd memory usage grows to 1,5 GB or more without this... - make log_timestamp static metze (This used to be commit 551dd12baf9340ab070c8a8edca6b56770243a61) --- source4/lib/util/debug.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 3a71ed2df6..4cf7c21641 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -46,6 +46,24 @@ static struct { const char *prog_name; } state; +static void log_timestring(int level, const char *location, const char *func) +{ + char *t = NULL; + char *s = NULL; + + if (state.logtype != DEBUG_FILE) return; + + t = timestring(NULL, time(NULL)); + if (!t) return; + + asprintf(&s, "[%s, %d %s:%s()]\n", t, level, location, func); + talloc_free(t); + if (!s) return; + + write(state.fd, s, strlen(s)); + free(s); +} + /* the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called @@ -60,7 +78,7 @@ void do_debug_header(int level, const char *location, const char *func) the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called */ -void do_debug(const char *format, ...) +void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) { va_list ap; char *s = NULL; @@ -76,6 +94,7 @@ void do_debug(const char *format, ...) va_end(ap); write(state.fd, s, strlen(s)); + fsync(state.fd); free(s); } @@ -119,6 +138,7 @@ void reopen_logs(void) } if (old_fd > 2) { + fsync(old_fd); close(old_fd); } } @@ -173,24 +193,6 @@ void print_suspicious_usage(const char* from, const char* info) } } -void log_timestring(int level, const char *location, const char *func) -{ - char *t = NULL; - char *s = NULL; - - if (state.logtype != DEBUG_FILE) return; - - t = timestring(NULL, time(NULL)); - if (!t) return; - - asprintf(&s, "[%s, %d %s:%s()]\n", t, level, location, func); - talloc_free(t); - if (!s) return; - - write(state.fd, s, strlen(s)); - free(s); -} - uint32_t get_task_id(void) { if (debug_handlers.ops.get_task_id) { -- cgit From af30a32b6924b0f2b701186e435defbca2ebd1aa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 5 Mar 2006 17:15:19 +0000 Subject: r13840: Mark some functions as public. (This used to be commit 9a188eb1f48a50d92a67a4fc2b3899b90074059a) --- source4/lib/util/debug.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 4cf7c21641..1c5bb25753 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -30,7 +30,7 @@ **/ /* this global variable determines what messages are printed */ -int DEBUGLEVEL; +_PUBLIC_ int DEBUGLEVEL; /* the registered mutex handlers */ @@ -68,7 +68,7 @@ static void log_timestring(int level, const char *location, const char *func) the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called */ -void do_debug_header(int level, const char *location, const char *func) +_PUBLIC_ void do_debug_header(int level, const char *location, const char *func) { log_timestring(level, location, func); log_task_id(); @@ -78,7 +78,7 @@ void do_debug_header(int level, const char *location, const char *func) the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called */ -void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) +_PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) { va_list ap; char *s = NULL; @@ -101,7 +101,7 @@ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) /** reopen the log file (usually called because the log file name might have changed) */ -void reopen_logs(void) +_PUBLIC_ void reopen_logs(void) { const char *logfile = lp_logfile(); char *fname = NULL; @@ -147,7 +147,7 @@ void reopen_logs(void) control the name of the logfile and whether logging will be to stdout, stderr or a file */ -void setup_logging(const char *prog_name, enum debug_logtype new_logtype) +_PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtype) { if (state.logtype < new_logtype) { state.logtype = new_logtype; @@ -162,7 +162,7 @@ void setup_logging(const char *prog_name, enum debug_logtype new_logtype) return a string constant containing n tabs no more than 10 tabs are returned */ -const char *do_debug_tab(uint_t n) +_PUBLIC_ const char *do_debug_tab(uint_t n) { const char *tabs[] = {"", "\t", "\t\t", "\t\t\t", "\t\t\t\t", "\t\t\t\t\t", "\t\t\t\t\t\t", "\t\t\t\t\t\t\t", "\t\t\t\t\t\t\t\t", @@ -174,7 +174,7 @@ const char *do_debug_tab(uint_t n) /** log suspicious usage - print comments and backtrace */ -void log_suspicious_usage(const char *from, const char *info) +_PUBLIC_ void log_suspicious_usage(const char *from, const char *info) { if (debug_handlers.ops.log_suspicious_usage) { debug_handlers.ops.log_suspicious_usage(from, info); @@ -185,15 +185,14 @@ void log_suspicious_usage(const char *from, const char *info) /** print suspicious usage - print comments and backtrace */ - -void print_suspicious_usage(const char* from, const char* info) +_PUBLIC_ void print_suspicious_usage(const char* from, const char* info) { if (debug_handlers.ops.print_suspicious_usage) { debug_handlers.ops.print_suspicious_usage(from, info); } } -uint32_t get_task_id(void) +_PUBLIC_ uint32_t get_task_id(void) { if (debug_handlers.ops.get_task_id) { return debug_handlers.ops.get_task_id(); @@ -201,7 +200,7 @@ uint32_t get_task_id(void) return getpid(); } -void log_task_id(void) +_PUBLIC_ void log_task_id(void) { if (debug_handlers.ops.log_task_id) { debug_handlers.ops.log_task_id(state.fd); @@ -211,7 +210,7 @@ void log_task_id(void) /** register a set of debug handlers. */ -void register_debug_handlers(const char *name, struct debug_ops *ops) +_PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops) { debug_handlers.name = name; debug_handlers.ops = *ops; -- cgit From c287cc247d90c996894cab18e870c992e7f84f85 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 6 Mar 2006 00:24:51 +0000 Subject: r13851: More doc improvements. (This used to be commit 936d26ae64b93ef8f8b2fbc632b1c2fd60840405) --- source4/lib/util/debug.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 1c5bb25753..e4f13ea28e 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -29,10 +29,11 @@ * @brief Debug logging **/ -/* this global variable determines what messages are printed */ +/** + * this global variable determines what messages are printed + */ _PUBLIC_ int DEBUGLEVEL; - /* the registered mutex handlers */ static struct { const char *name; @@ -64,7 +65,7 @@ static void log_timestring(int level, const char *location, const char *func) free(s); } -/* +/** the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called */ @@ -74,9 +75,12 @@ _PUBLIC_ void do_debug_header(int level, const char *location, const char *func) log_task_id(); } -/* +/** the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called + + @note You should never have to call this function directly. Call the DEBUG() + macro instead. */ _PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) { -- cgit From 1c49d8f794762d0f3828237961012761212cb37e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 6 Mar 2006 13:55:56 +0000 Subject: r13859: - remove useless fsync() calls - make sure we only close the old_fd when the new one was opened metze (This used to be commit 3a6568c3669286d41343293c29c8d00fa78c372f) --- source4/lib/util/debug.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index e4f13ea28e..65f8586eaa 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -98,7 +98,6 @@ _PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) va_end(ap); write(state.fd, s, strlen(s)); - fsync(state.fd); free(s); } @@ -130,6 +129,7 @@ _PUBLIC_ void reopen_logs(void) int newfd = open(fname, O_CREAT|O_APPEND|O_WRONLY, 0600); if (newfd == -1) { DEBUG(1, ("Failed to open new logfile: %s\n", fname)); + old_fd = -1; } else { state.fd = newfd; } @@ -142,7 +142,6 @@ _PUBLIC_ void reopen_logs(void) } if (old_fd > 2) { - fsync(old_fd); close(old_fd); } } -- cgit From 8bec5a464a88b9762d2dbef359aa7b118a65892f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 8 Mar 2006 12:31:57 +0000 Subject: r14038: reopen log files after a SIGHUP metze (This used to be commit 8e9a69171a03a1f886fcff911e8a923368645a54) --- source4/lib/util/debug.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 65f8586eaa..2c40064b75 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -47,11 +47,31 @@ static struct { const char *prog_name; } state; +static BOOL reopen_logs_scheduled; +static BOOL check_reopen_logs(void) +{ + if (state.fd == 0 || reopen_logs_scheduled) { + reopen_logs_scheduled = False; + reopen_logs(); + } + + if (state.fd <= 0) return False; + + return True; +} + +_PUBLIC_ void debug_schedule_reopen_logs(void) +{ + reopen_logs_scheduled = True; +} + static void log_timestring(int level, const char *location, const char *func) { char *t = NULL; char *s = NULL; + if (!check_reopen_logs()) return; + if (state.logtype != DEBUG_FILE) return; t = timestring(NULL, time(NULL)); @@ -87,11 +107,7 @@ _PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) va_list ap; char *s = NULL; - if (state.fd == 0) { - reopen_logs(); - } - - if (state.fd <= 0) return; + if (!check_reopen_logs()) return; va_start(ap, format); vasprintf(&s, format, ap); @@ -179,9 +195,9 @@ _PUBLIC_ const char *do_debug_tab(uint_t n) */ _PUBLIC_ void log_suspicious_usage(const char *from, const char *info) { - if (debug_handlers.ops.log_suspicious_usage) { - debug_handlers.ops.log_suspicious_usage(from, info); - } + if (!debug_handlers.ops.log_suspicious_usage) return; + + debug_handlers.ops.log_suspicious_usage(from, info); } @@ -190,9 +206,9 @@ _PUBLIC_ void log_suspicious_usage(const char *from, const char *info) */ _PUBLIC_ void print_suspicious_usage(const char* from, const char* info) { - if (debug_handlers.ops.print_suspicious_usage) { - debug_handlers.ops.print_suspicious_usage(from, info); - } + if (!debug_handlers.ops.print_suspicious_usage) return; + + debug_handlers.ops.print_suspicious_usage(from, info); } _PUBLIC_ uint32_t get_task_id(void) @@ -205,9 +221,11 @@ _PUBLIC_ uint32_t get_task_id(void) _PUBLIC_ void log_task_id(void) { - if (debug_handlers.ops.log_task_id) { - debug_handlers.ops.log_task_id(state.fd); - } + if (!debug_handlers.ops.log_task_id) return; + + if (!check_reopen_logs()) return; + + debug_handlers.ops.log_task_id(state.fd); } /** -- cgit From 18cddd580e04344e05593d9f63beb9ead53cfab2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 20 Mar 2006 00:28:12 +0000 Subject: r14575: Move some path-related functions to libsamba-config so libsamba-util doesn't have to depend on the lp_* functions. (This used to be commit f97df7d90a41b77a9edd2d6bdc47c27bf1b6bb07) --- source4/lib/util/debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 2c40064b75..fa781c823a 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -117,12 +117,13 @@ _PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) free(s); } +_PUBLIC_ const char *logfile = NULL; + /** reopen the log file (usually called because the log file name might have changed) */ _PUBLIC_ void reopen_logs(void) { - const char *logfile = lp_logfile(); char *fname = NULL; int old_fd = state.fd; -- cgit From 0eddf14b307e905663b95296aa695a10d3fb90f7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 24 Apr 2006 09:36:09 +0000 Subject: r15191: Avoid uint_t as it's not standard. (This used to be commit 7af59357b94e3819415b3a9257be0ced745ce130) --- source4/lib/util/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index fa781c823a..9084c2b406 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -182,7 +182,7 @@ _PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtyp return a string constant containing n tabs no more than 10 tabs are returned */ -_PUBLIC_ const char *do_debug_tab(uint_t n) +_PUBLIC_ const char *do_debug_tab(int n) { const char *tabs[] = {"", "\t", "\t\t", "\t\t\t", "\t\t\t\t", "\t\t\t\t\t", "\t\t\t\t\t\t", "\t\t\t\t\t\t\t", "\t\t\t\t\t\t\t\t", -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/lib/util/debug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 9084c2b406..c29b3bfaec 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ #include "includes.h" -- cgit From 4fb038b0b8e7a4bb69ac0d9022684eeaca8a491a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 27 Aug 2007 17:21:16 +0000 Subject: r24710: Use standard boolean type for easier use by external users. (This used to be commit 99f4124137d4a61216e8189f26d4da32882c0f4a) --- source4/lib/util/debug.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index c29b3bfaec..67663cb6ce 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -46,22 +46,23 @@ static struct { const char *prog_name; } state; -static BOOL reopen_logs_scheduled; -static BOOL check_reopen_logs(void) +static bool reopen_logs_scheduled; +static bool check_reopen_logs(void) { if (state.fd == 0 || reopen_logs_scheduled) { - reopen_logs_scheduled = False; + reopen_logs_scheduled = false; reopen_logs(); } - if (state.fd <= 0) return False; + if (state.fd <= 0) + return false; - return True; + return true; } _PUBLIC_ void debug_schedule_reopen_logs(void) { - reopen_logs_scheduled = True; + reopen_logs_scheduled = true; } static void log_timestring(int level, const char *location, const char *func) -- cgit From 149190ff2108ba203f5cddd4414e2d02e469747a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 5 Nov 2007 10:10:17 +0100 Subject: r25830: fix compiler warning metze (This used to be commit 26bfdff48779447a2f4b552c5af32abf2b8c4c45) --- source4/lib/util/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 67663cb6ce..070cdee7d5 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -102,7 +102,7 @@ _PUBLIC_ void do_debug_header(int level, const char *location, const char *func) @note You should never have to call this function directly. Call the DEBUG() macro instead. */ -_PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2) +_PUBLIC_ void do_debug(const char *format, ...) { va_list ap; char *s = NULL; -- cgit From 99930fe4e9c4665b06a41f4acc4c9127a2214681 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 11 Dec 2007 00:22:05 +0100 Subject: r26386: We need to test in more than just 'interactive' mode... Fix segfault found when running smbd without options. Andrew Bartlett (This used to be commit 880dfeadae41be5f0140ac07afb8680fc11f6ebf) --- source4/lib/util/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 070cdee7d5..5c1abf5039 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -137,7 +137,7 @@ _PUBLIC_ void reopen_logs(void) break; case DEBUG_FILE: - if ((*logfile) == '/') { + if (logfile && (*logfile) == '/') { fname = strdup(logfile); } else { asprintf(&fname, "%s/%s.log", dyn_LOGFILEBASE, state.prog_name); -- cgit From 936b973acbc756cc3b6cb0d9df85ebc28ba76ae7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 May 2008 14:36:28 +0200 Subject: Use new dynconfig.h location. (This used to be commit c3f556915f09d078253e4c5539910a1cf420eeca) --- source4/lib/util/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/util/debug.c') diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 5c1abf5039..00dcbfc8bd 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/filesys.h" #include "system/time.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" /** * @file -- cgit