From e46bae0c95eb79ce9dc2119ff58ae5ad498d2d52 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sun, 30 Jan 2011 12:12:44 +0100 Subject: [PATCH] by jimcuclamath: use defines instead of numbers for logging; Change some loglevels to DEBUG --- citadel/citserver.c | 8 ++++---- citadel/database.c | 4 ++-- citadel/ecrash.c | 6 +++--- citadel/ical_dezonify.c | 26 +++++++++++++------------- citadel/msgbase.c | 2 +- citadel/serv_extensions.c | 4 ++-- citadel/user_ops.c | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index 93a02389f..a8db75c61 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -98,9 +98,9 @@ void cit_backtrace(void) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - CtdlLogPrintf(1, "%s\n", strings[i]); + CtdlLogPrintf(CTDL_ALERT, "%s\n", strings[i]); else - CtdlLogPrintf(1, "%p\n", stack_frames[i]); + CtdlLogPrintf(CTDL_ALERT, "%p\n", stack_frames[i]); } free(strings); #endif @@ -121,9 +121,9 @@ void cit_panic_backtrace(int SigNum) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - CtdlLogPrintf(1, "%s\n", strings[i]); + CtdlLogPrintf(CTDL_ALERT, "%s\n", strings[i]); else - CtdlLogPrintf(1, "%p\n", stack_frames[i]); + CtdlLogPrintf(CTDL_ALERT, "%p\n", stack_frames[i]); } free(strings); #endif diff --git a/citadel/database.c b/citadel/database.c index 95c69476e..155910a2d 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -427,10 +427,10 @@ void cdb_chmod_data(void) { if (d->d_name[0] != '.') { snprintf(filename, sizeof filename, "%s/%s", ctdl_data_dir, d->d_name); - CtdlLogPrintf(9, "chmod(%s, 0600) returned %d\n", + CtdlLogPrintf(CTDL_DEBUG, "chmod(%s, 0600) returned %d\n", filename, chmod(filename, 0600) ); - CtdlLogPrintf(9, "chown(%s, CTDLUID, -1) returned %d\n", + CtdlLogPrintf(CTDL_DEBUG, "chown(%s, CTDLUID, -1) returned %d\n", filename, chown(filename, CTDLUID, (-1)) ); } diff --git a/citadel/ecrash.c b/citadel/ecrash.c index f93742a71..ea75ea1cd 100644 --- a/citadel/ecrash.c +++ b/citadel/ecrash.c @@ -216,7 +216,7 @@ static void createGlobalBacktrace( void ) } else for (NThread = 0; NThread < size; NThread++) - CtdlLogPrintf(1, "RAW: %p\n", stack_frames[NThread]); + CtdlLogPrintf(CTDL_ALERT, "RAW: %p\n", stack_frames[NThread]); strings = backtrace_symbols(stack_frames, size); for (NThread = 0; NThread < size; NThread++) { if (strings != NULL) { @@ -226,7 +226,7 @@ static void createGlobalBacktrace( void ) syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf); } else - CtdlLogPrintf(1, "%s\n", strings[NThread]); + CtdlLogPrintf(CTDL_ALERT, "%s\n", strings[NThread]); } } } /* createGlobalBacktrace */ @@ -242,7 +242,7 @@ static void outputRawtrace( void ) } else for (NThread = 0; NThread < size; NThread++) - CtdlLogPrintf(1, "RAW: %p\n", stack_frames[NThread]); + CtdlLogPrintf(CTDL_ALERT, "RAW: %p\n", stack_frames[NThread]); } /* createGlobalBacktrace */ /*! diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c index 8ec12f7e9..40e251661 100644 --- a/citadel/ical_dezonify.c +++ b/citadel/ical_dezonify.c @@ -46,7 +46,7 @@ icaltimezone *get_default_icaltimezone(void) { zone = icaltimezone_get_utc_timezone(); } if (!zone) { - CtdlLogPrintf(1, "Unable to load UTC time zone!\n"); + CtdlLogPrintf(CTDL_ALERT, "Unable to load UTC time zone!\n"); } return zone; } @@ -81,16 +81,16 @@ void ical_dezonify_backend(icalcomponent *cal, /* Convert it to an icaltimezone type. */ if (tzid != NULL) { - /* CtdlLogPrintf(9, " * Stringy supplied timezone is: '%s'\n", tzid); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * Stringy supplied timezone is: '%s'\n", tzid); */ if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) { utc_declared_as_tzid = 1; - /* CtdlLogPrintf(9, " * ...and we handle that internally.\n"); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * ...and we handle that internally.\n"); */ } else { /* try attached first */ t = icalcomponent_get_timezone(cal, tzid); /* - lprintf(9, " * ...and I %s have tzdata for that zone.\n", + lprintf(CTDL_DEBUG, " * ...and I %s have tzdata for that zone.\n", (t ? "DO" : "DO NOT") ); */ @@ -99,7 +99,7 @@ void ical_dezonify_backend(icalcomponent *cal, t = icaltimezone_get_builtin_timezone(tzid); /* if (t) { - lprintf(9, " * Using system tzdata!\n"); + lprintf(CTDL_DEBUG, " * Using system tzdata!\n"); } */ } @@ -126,24 +126,24 @@ void ical_dezonify_backend(icalcomponent *cal, return; } - /* CtdlLogPrintf(9, " * Was: %s\n", icaltime_as_ical_string(TheTime)); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * Was: %s\n", icaltime_as_ical_string(TheTime)); */ if (TheTime.is_utc) { - /* CtdlLogPrintf(9, " * This property is ALREADY UTC.\n"); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * This property is ALREADY UTC.\n"); */ } else if (utc_declared_as_tzid) { - /* CtdlLogPrintf(9, " * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */ TheTime.is_utc = 1; } else { /* Do the conversion. */ if (t != NULL) { - /* CtdlLogPrintf(9, " * Timezone prop found. Converting to UTC.\n"); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * Timezone prop found. Converting to UTC.\n"); */ } else { - /* CtdlLogPrintf(9, " * Converting default timezone to UTC.\n"); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * Converting default timezone to UTC.\n"); */ } if (t == NULL) { @@ -158,7 +158,7 @@ void ical_dezonify_backend(icalcomponent *cal, } icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER); - /* CtdlLogPrintf(9, " * Now: %s\n", icaltime_as_ical_string(TheTime)); */ + /* CtdlLogPrintf(CTDL_DEBUG, " * Now: %s\n", icaltime_as_ical_string(TheTime)); */ /* Now add the converted property back in. */ if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) { @@ -224,7 +224,7 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) { void ical_dezonify(icalcomponent *cal) { icalcomponent *vt = NULL; - /* CtdlLogPrintf(9, "ical_dezonify() started\n"); */ + /* CtdlLogPrintf(CTDL_DEBUG, "ical_dezonify() started\n"); */ /* Convert all times to UTC */ ical_dezonify_recurse(cal, cal); @@ -236,5 +236,5 @@ void ical_dezonify(icalcomponent *cal) { icalcomponent_free(vt); } - /* CtdlLogPrintf(9, "ical_dezonify() completed\n"); */ + /* CtdlLogPrintf(CTDL_DEBUG, "ical_dezonify() completed\n"); */ } diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 9c8ab8602..88c63a802 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -2625,7 +2625,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms } } - CtdlLogPrintf(9, "%d unique messages to be merged\n", num_msgs_to_be_merged); + CtdlLogPrintf(CTDL_DEBUG, "%d unique messages to be merged\n", num_msgs_to_be_merged); /* * Now merge the new messages diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index e23772e96..7bcae2b12 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -109,8 +109,8 @@ void LogPrintMessages(long err) snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList); - CtdlLogPrintf(0,Message); - CtdlLogPrintf(0,ErrSubject); + CtdlLogPrintf(CTDL_DEBUG,Message); + CtdlLogPrintf(CTDL_DEBUG,ErrSubject); quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject); if (errormessages!=NULL) free (errormessages); errormessages = NULL; diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 2737c0446..d635f9617 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -517,7 +517,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) int found_user; long len; - CtdlLogPrintf(9, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname); + CtdlLogPrintf(CTDL_DEBUG, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname); if ((CC->logged_in)) { return login_already_logged_in; -- 2.30.2