-const char errlog_rcs[] = "$Id: errlog.c,v 1.79 2008/10/20 17:09:25 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.85 2009/02/06 17:51:38 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
* Purpose : Log errors to a designated destination in an elegant,
* printf-like fashion.
*
- * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2009 the SourceForge
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.85 2009/02/06 17:51:38 fabiankeil
+ * Be prepared if I break the log module initialization again.
+ *
+ * Revision 1.84 2008/12/14 15:46:22 fabiankeil
+ * Give crunched requests their own log level.
+ *
+ * Revision 1.83 2008/12/04 18:14:32 fabiankeil
+ * Fix some cparser warnings.
+ *
+ * Revision 1.82 2008/11/23 16:06:58 fabiankeil
+ * Update a log message I missed in 1.80.
+ *
+ * Revision 1.81 2008/11/23 15:59:27 fabiankeil
+ * - Update copyright range.
+ * - Remove stray line breaks in a log message
+ * nobody is supposed to see anyway.
+ *
+ * Revision 1.80 2008/11/23 15:49:49 fabiankeil
+ * In log_error(), don't surround the thread id with "Privoxy(" and ")".
+ *
* Revision 1.79 2008/10/20 17:09:25 fabiankeil
* Update init_error_log() description to match reality.
*
* Returns : Nothing.
*
*********************************************************************/
-static void show_version(const char *prog_name)
+void show_version(const char *prog_name)
{
log_error(LOG_LEVEL_INFO, "Privoxy version " VERSION);
if (prog_name != NULL)
* Returns : Nothing.
*
*********************************************************************/
-void init_log_module(const char *prog_name)
+void init_log_module(void)
{
lock_logfile();
logfp = stderr;
unlock_logfile();
set_debug_level(debug);
- show_version(prog_name);
}
/*
* Prevent the Windows GUI from showing the version two
* times in a row on startup. It already displayed the show_version()
- * call from init_log_module() that other systems write to stderr.
+ * call from main() that other systems write to stderr.
*
* This means mingw32 users will never see the version in their
* log file, but I assume they wouldn't look for it there anyway
#endif
length = strftime(buffer, buffer_size, "%b %d %H:%M:%S", &tm_now);
- if (length > 0)
+ if (length > (size_t)0)
{
msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
}
length = strftime(buffer, buffer_size, "%d/%b/%Y:%H:%M:%S ", tm_now);
- if (length > 0)
+ if (length > (size_t)0)
{
tz_length = snprintf(buffer+length, buffer_size-length,
"%+03d%02d", mins / 60, abs(mins) % 60);
case LOG_LEVEL_DEANIMATE:
log_level_string = "Gif-Deanimate";
break;
+ case LOG_LEVEL_CRUNCH:
+ log_level_string = "Crunch";
+ break;
case LOG_LEVEL_CGI:
log_level_string = "CGI";
break;
* the taskbar icon animate. (There is an option to disable
* this but checking that is handled inside LogShowActivity()).
*/
- if (loglevel == LOG_LEVEL_GPC)
+ if ((loglevel == LOG_LEVEL_GPC) || (loglevel == LOG_LEVEL_CRUNCH))
{
LogShowActivity();
}
#endif
)
{
+ if (loglevel == LOG_LEVEL_FATAL)
+ {
+ fatal_error("Fatal error. You're not supposed to"
+ "see this message. Please file a bug report.");
+ }
return;
}
if (NULL == outbuf_save)
{
snprintf(tempbuf, sizeof(tempbuf),
- "%s %08lx Fatal error: log_error() failed to allocate buffer memory.\n"
- "\nExiting.", timestamp, thread_id);
+ "%s %08lx Fatal error: Out of memory in log_error().",
+ timestamp, thread_id);
fatal_error(tempbuf); /* Exit */
}
}
format_string = "[counted string lenght < 0]";
}
}
- else if (ival >= sizeof(tempbuf))
+ else if ((size_t)ival >= sizeof(tempbuf))
{
/*
* String is too long, copy as much as possible.
assert(outbuf[log_buffer_size] == '\0');
snprintf(outbuf, log_buffer_size,
- "%s Privoxy(%08lx) Fatal error: log_error()'s sanity checks failed. length: %d\n"
- "Exiting.", timestamp, thread_id, (int)length);
+ "%s %08lx Fatal error: log_error()'s sanity checks failed."
+ "length: %d. Exiting.",
+ timestamp, thread_id, (int)length);
loglevel = LOG_LEVEL_FATAL;
}