X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=0e7f726c3027723c959977aa810a8bc9d484c53c;hp=b9ad70c42818107a45bcdf6bcc4bd2397c0146e2;hb=15036114ec47da24adb7a59ed1bab5a346d85e0f;hpb=76514c066f4b46ba1d63e2255edfb59f6e3ce3b3 diff --git a/errlog.c b/errlog.c index b9ad70c4..0e7f726c 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.38 2002/03/31 17:18:59 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -7,7 +7,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; * printf-like fashion. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,18 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; * * Revisions : * $Log: errlog.c,v $ + * Revision 1.38 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.37 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.36 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.35 2002/03/24 15:23:33 jongfoster + * Name changes + * * Revision 1.34 2002/03/24 13:25:43 swa * name change related issues * @@ -218,6 +230,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; #endif /* def FEATURE_PTHREAD */ #ifdef _WIN32 +#ifndef STRICT +#define STRICT +#endif #include #ifndef _WIN_CONSOLE #include "w32log.h" @@ -225,6 +240,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; #endif /* def _WIN32 */ #ifdef __OS2__ +#include /* For sock_errno */ #define INCL_DOS #include #endif @@ -430,41 +446,41 @@ void log_error(int loglevel, char *fmt, ...) switch (loglevel) { case LOG_LEVEL_ERROR: - outc = sprintf(outbuf, "Privoxy(%ld) Error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Error: ", this_thread); break; case LOG_LEVEL_FATAL: - outc = sprintf(outbuf, "Privoxy(%ld) Fatal error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Fatal error: ", this_thread); break; case LOG_LEVEL_GPC: - outc = sprintf(outbuf, "Privoxy(%ld) Request: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Request: ", this_thread); break; case LOG_LEVEL_CONNECT: - outc = sprintf(outbuf, "Privoxy(%ld) Connect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Connect: ", this_thread); break; case LOG_LEVEL_LOG: - outc = sprintf(outbuf, "Privoxy(%ld) Writing: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Writing: ", this_thread); break; case LOG_LEVEL_HEADER: - outc = sprintf(outbuf, "Privoxy(%ld) Header: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Header: ", this_thread); break; case LOG_LEVEL_INFO: - outc = sprintf(outbuf, "Privoxy(%ld) Info: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Info: ", this_thread); break; case LOG_LEVEL_RE_FILTER: - outc = sprintf(outbuf, "Privoxy(%ld) Re-Filter: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Re-Filter: ", this_thread); break; #ifdef FEATURE_FORCE_LOAD case LOG_LEVEL_FORCE: - outc = sprintf(outbuf, "Privoxy(%ld) Force: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Force: ", this_thread); break; #endif /* def FEATURE_FORCE_LOAD */ #ifdef FEATURE_FAST_REDIRECTS case LOG_LEVEL_REDIRECTS: - outc = sprintf(outbuf, "Privoxy(%ld) Redirect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Redirect: ", this_thread); break; #endif /* def FEATURE_FAST_REDIRECTS */ case LOG_LEVEL_DEANIMATE: - outc = sprintf(outbuf, "Privoxy(%ld) Gif-Deanimate: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Gif-Deanimate: ", this_thread); break; case LOG_LEVEL_CLF: outbuf = outbuf_save; @@ -473,14 +489,14 @@ void log_error(int loglevel, char *fmt, ...) break; #ifdef FEATURE_KILL_POPUPS case LOG_LEVEL_POPUPS: - outc = sprintf(outbuf, "Privoxy(%ld) Kill-Popups: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Kill-Popups: ", this_thread); break; #endif /* def FEATURE_KILL_POPUPS */ case LOG_LEVEL_CGI: - outc = sprintf(outbuf, "Privoxy(%ld) CGI: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) CGI: ", this_thread); break; default: - outc = sprintf(outbuf, "Privoxy(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); + outc = sprintf(outbuf, "Privoxy(%05ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); break; }