projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding prototype for map_conditional
[privoxy.git]
/
errlog.c
diff --git
a/errlog.c
b/errlog.c
index
f069875
..
76ad1fd
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.1
3 2001/07/13 13:58:58 oes
Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.1
5 2001/07/29 17:41:10 jongfoster
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@
-33,6
+33,12
@@
const char errlog_rcs[] = "$Id: errlog.c,v 1.13 2001/07/13 13:58:58 oes Exp $";
*
* Revisions :
* $Log: errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.15 2001/07/29 17:41:10 jongfoster
+ * Now prints thread ID for each message (pthreads only)
+ *
+ * Revision 1.14 2001/07/19 19:03:48 haroon
+ * - Added case for LOG_LEVEL_POPUPS
+ *
* Revision 1.13 2001/07/13 13:58:58 oes
* - Added case for LOG_LEVEL_DEANIMATE
* - Removed all #ifdef PCRS
* Revision 1.13 2001/07/13 13:58:58 oes
* - Added case for LOG_LEVEL_DEANIMATE
* - Removed all #ifdef PCRS
@@
-134,7
+140,9
@@
const char errlog_rcs[] = "$Id: errlog.c,v 1.13 2001/07/13 13:58:58 oes Exp $";
#endif /* ndef _WIN32 */
#include <errno.h>
#endif /* ndef _WIN32 */
#include <errno.h>
-/* #include <pthread.h> */
+#ifdef FEATURE_PTHREAD
+#include <pthread.h>
+#endif /* def FEATURE_PTHREAD */
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-297,7
+305,9
@@
void log_error(int loglevel, char *fmt, ...)
}
/* FIXME get current thread id */
}
/* FIXME get current thread id */
- /* this_thread = (long)pthread_self(); */
+#ifdef FEATURE_PTHREAD
+ this_thread = (long)pthread_self();
+#endif /* def FEATURE_PTHREAD */
switch (loglevel)
{
switch (loglevel)
{
@@
-325,16
+335,16
@@
void log_error(int loglevel, char *fmt, ...)
case LOG_LEVEL_RE_FILTER:
outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
break;
case LOG_LEVEL_RE_FILTER:
outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
break;
-#ifdef FORCE_LOAD
+#ifdef F
EATURE_F
ORCE_LOAD
case LOG_LEVEL_FORCE:
outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
break;
case LOG_LEVEL_FORCE:
outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
break;
-#endif /* def FORCE_LOAD */
-#ifdef FAST_REDIRECTS
+#endif /* def F
EATURE_F
ORCE_LOAD */
+#ifdef F
EATURE_F
AST_REDIRECTS
case LOG_LEVEL_REDIRECTS:
outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread);
break;
case LOG_LEVEL_REDIRECTS:
outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread);
break;
-#endif /* def FAST_REDIRECTS */
+#endif /* def F
EATURE_F
AST_REDIRECTS */
case LOG_LEVEL_DEANIMATE:
outc = sprintf(outbuf, "IJB(%d) Gif-Deanimate: ", this_thread);
break;
case LOG_LEVEL_DEANIMATE:
outc = sprintf(outbuf, "IJB(%d) Gif-Deanimate: ", this_thread);
break;
@@
-342,11
+352,11
@@
void log_error(int loglevel, char *fmt, ...)
outc = 0;
outbuf[0] = '\0';
break;
outc = 0;
outbuf[0] = '\0';
break;
-#ifdef
KILL
POPUPS
+#ifdef
FEATURE_KILL_
POPUPS
case LOG_LEVEL_POPUPS:
outc = sprintf(outbuf, "IJB(%d) Kill-Popups: ", this_thread);
break;
case LOG_LEVEL_POPUPS:
outc = sprintf(outbuf, "IJB(%d) Kill-Popups: ", this_thread);
break;
-#endif /* def
KILL
POPUPS */
+#endif /* def
FEATURE_KILL_
POPUPS */
default:
outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
break;
default:
outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
break;