projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Re-enable OS/2 building after new parms were added
[privoxy.git]
/
errlog.c
diff --git
a/errlog.c
b/errlog.c
index
e75da78
..
520cc70
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.2
6 2002/01/09 19:05:45 steudten
Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.2
8 2002/03/04 17:59:59 oes
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.26 2002/01/09 19:05:45 steudten Exp
*
* Revisions :
* $Log: errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.28 2002/03/04 17:59:59 oes
+ * Deleted deletePidFile(), cosmetics
+ *
+ * Revision 1.27 2002/03/04 02:08:01 david__schmidt
+ * Enable web editing of actions file on OS/2 (it had been broken all this time!)
+ *
* Revision 1.26 2002/01/09 19:05:45 steudten
* Fix big memory leak.
*
* Revision 1.26 2002/01/09 19:05:45 steudten
* Fix big memory leak.
*
@@
-206,6
+212,7
@@
const char errlog_rcs[] = "$Id: errlog.c,v 1.26 2002/01/09 19:05:45 steudten Exp
#include "errlog.h"
#include "project.h"
#include "errlog.h"
#include "project.h"
+#include "jcc.h"
const char errlog_h_rcs[] = ERRLOG_H_VERSION;
const char errlog_h_rcs[] = ERRLOG_H_VERSION;
@@
-257,7
+264,7
@@
static void fatal_error(const char * error_message)
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
#if defined(unix)
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
#if defined(unix)
-
deletePidFile(
);
+
unlink(pidfile
);
#endif /* unix */
exit(1);
#endif /* unix */
exit(1);
@@
-266,7
+273,7
@@
static void fatal_error(const char * error_message)
/*********************************************************************
*
/*********************************************************************
*
- * Function : init_errlog
+ * Function : init_err
or_
log
*
* Description : Initializes the logging module. Must call before
* calling log_error.
*
* Description : Initializes the logging module. Must call before
* calling log_error.
@@
-300,7
+307,7
@@
void init_error_log(const char *prog_name, const char *logfname, int debuglevel)
{
if( !(fp = fopen(logfname, "a")) )
{
{
if( !(fp = fopen(logfname, "a")) )
{
- log_error(LOG_LEVEL_FATAL, "init_errlog(): can't open logfile: %s", logfname);
+ log_error(LOG_LEVEL_FATAL, "init_err
or_
log(): can't open logfile: %s", logfname);
}
/* set logging to be completely unbuffered */
}
/* set logging to be completely unbuffered */
@@
-368,8
+375,9
@@
void log_error(int loglevel, char *fmt, ...)
/* FIXME get current thread id */
#ifdef FEATURE_PTHREAD
this_thread = (long)pthread_self();
/* FIXME get current thread id */
#ifdef FEATURE_PTHREAD
this_thread = (long)pthread_self();
-#elif __OS2__
-
+#elif defined(_WIN32)
+ this_thread = GetCurrentThreadId();
+#elif defined(__OS2__)
ulrc = DosGetInfoBlocks(&ptib, NULL);
if (ulrc == 0)
this_thread = ptib -> tib_ptib2 -> tib2_ultid;
ulrc = DosGetInfoBlocks(&ptib, NULL);
if (ulrc == 0)
this_thread = ptib -> tib_ptib2 -> tib2_ultid;