X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=errlog.c;h=b9ad70c42818107a45bcdf6bcc4bd2397c0146e2;hb=d9e866e8cb9eba5dd69984a82af8899e3b7004b6;hp=f91461ea4158124966ff6c4d9a61dfd7b00b77ab;hpb=1251e702bce39f773f2213aa419d0254cb0a4a2e;p=privoxy.git diff --git a/errlog.c b/errlog.c index f91461ea..b9ad70c4 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.31 2002/03/06 23:02:57 jongfoster Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -7,7 +7,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.31 2002/03/06 23:02:57 jongfoster E * printf-like fashion. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://ijbswa.sourceforge.net * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,15 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.31 2002/03/06 23:02:57 jongfoster E * * Revisions : * $Log: errlog.c,v $ + * Revision 1.34 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.33 2002/03/13 00:27:04 jongfoster + * Killing warnings + * + * Revision 1.32 2002/03/07 03:46:17 oes + * Fixed compiler warnings + * * Revision 1.31 2002/03/06 23:02:57 jongfoster * Removing tabs * @@ -263,7 +272,7 @@ static char *w32_socket_strerr(int errcode, char *tmp_buf); static void fatal_error(const char * error_message) { #if defined(_WIN32) && !defined(_WIN_CONSOLE) - MessageBox(g_hwndLogFrame, error_message, "Internet JunkBuster Error", + MessageBox(g_hwndLogFrame, error_message, "Privoxy Error", MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); /* Cleanup - remove taskbar icon etc. */ @@ -315,7 +324,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) /* set the designated log file */ if( logfname ) { - if( !(fp = fopen(logfname, "a")) ) + if( NULL == (fp = fopen(logfname, "a")) ) { log_error(LOG_LEVEL_FATAL, "init_error_log(): can't open logfile: %s", logfname); } @@ -326,7 +335,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) logfp = fp; } - log_error(LOG_LEVEL_INFO, "Internet JunkBuster version " VERSION); + log_error(LOG_LEVEL_INFO, "Privoxy version " VERSION); if (prog_name != NULL) { log_error(LOG_LEVEL_INFO, "Program name: %s", prog_name); @@ -421,41 +430,41 @@ void log_error(int loglevel, char *fmt, ...) switch (loglevel) { case LOG_LEVEL_ERROR: - outc = sprintf(outbuf, "IJB(%ld) Error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Error: ", this_thread); break; case LOG_LEVEL_FATAL: - outc = sprintf(outbuf, "IJB(%ld) Fatal error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Fatal error: ", this_thread); break; case LOG_LEVEL_GPC: - outc = sprintf(outbuf, "IJB(%ld) Request: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Request: ", this_thread); break; case LOG_LEVEL_CONNECT: - outc = sprintf(outbuf, "IJB(%ld) Connect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Connect: ", this_thread); break; case LOG_LEVEL_LOG: - outc = sprintf(outbuf, "IJB(%ld) Writing: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Writing: ", this_thread); break; case LOG_LEVEL_HEADER: - outc = sprintf(outbuf, "IJB(%ld) Header: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Header: ", this_thread); break; case LOG_LEVEL_INFO: - outc = sprintf(outbuf, "IJB(%ld) Info: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Info: ", this_thread); break; case LOG_LEVEL_RE_FILTER: - outc = sprintf(outbuf, "IJB(%ld) Re-Filter: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Re-Filter: ", this_thread); break; #ifdef FEATURE_FORCE_LOAD case LOG_LEVEL_FORCE: - outc = sprintf(outbuf, "IJB(%ld) Force: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Force: ", this_thread); break; #endif /* def FEATURE_FORCE_LOAD */ #ifdef FEATURE_FAST_REDIRECTS case LOG_LEVEL_REDIRECTS: - outc = sprintf(outbuf, "IJB(%ld) Redirect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Redirect: ", this_thread); break; #endif /* def FEATURE_FAST_REDIRECTS */ case LOG_LEVEL_DEANIMATE: - outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Gif-Deanimate: ", this_thread); break; case LOG_LEVEL_CLF: outbuf = outbuf_save; @@ -464,14 +473,14 @@ void log_error(int loglevel, char *fmt, ...) break; #ifdef FEATURE_KILL_POPUPS case LOG_LEVEL_POPUPS: - outc = sprintf(outbuf, "IJB(%ld) Kill-Popups: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Kill-Popups: ", this_thread); break; #endif /* def FEATURE_KILL_POPUPS */ case LOG_LEVEL_CGI: - outc = sprintf(outbuf, "IJB(%ld) CGI: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) CGI: ", this_thread); break; default: - outc = sprintf(outbuf, "IJB(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); + outc = sprintf(outbuf, "Privoxy(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); break; } @@ -546,7 +555,7 @@ void log_error(int loglevel, char *fmt, ...) else { /* Error */ - sprintf(outbuf, "IJB(%ld) Error: log_error(): Bad format string:\n" + sprintf(outbuf, "Privoxy(%ld) Error: log_error(): Bad format string:\n" "Format = \"%s\"\n" "Exiting.", this_thread, fmt); /* FIXME RACE HAZARD: should start critical section error_log_use here */ @@ -689,7 +698,7 @@ void log_error(int loglevel, char *fmt, ...) } break; default: - sprintf(outbuf, "IJB(%ld) Error: log_error(): Bad format string:\n" + sprintf(outbuf, "Privoxy(%ld) Error: log_error(): Bad format string:\n" "Format = \"%s\"\n" "Exiting.", this_thread, fmt); /* FIXME RACE HAZARD: should start critical section error_log_use here */