projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start using the fancier radar icons.
[privoxy.git]
/
errlog.c
diff --git
a/errlog.c
b/errlog.c
index
7ffc7d1
..
2455d23
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.9
3 2009/05/16 13:27:20
fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.9
7 2009/06/14 15:59:56
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@
-422,12
+422,11
@@
static inline size_t get_log_timestamp(char *buffer, size_t buffer_size)
gettimeofday(&tv_now, NULL);
msecs = tv_now.tv_usec / 1000;
gettimeofday(&tv_now, NULL);
msecs = tv_now.tv_usec / 1000;
-
- time(&now);
+ now = tv_now.tv_sec;
#ifdef HAVE_LOCALTIME_R
tm_now = *localtime_r(&now, &tm_now);
#ifdef HAVE_LOCALTIME_R
tm_now = *localtime_r(&now, &tm_now);
-#elif
FEATURE_PTHREAD
+#elif
defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&localtime_mutex);
tm_now = *localtime(&now);
privoxy_mutex_unlock(&localtime_mutex);
privoxy_mutex_lock(&localtime_mutex);
tm_now = *localtime(&now);
privoxy_mutex_unlock(&localtime_mutex);
@@
-485,7
+484,7
@@
static inline size_t get_clf_timestamp(char *buffer, size_t buffer_size)
time (&now);
#ifdef HAVE_GMTIME_R
gmt = *gmtime_r(&now, &gmt);
time (&now);
#ifdef HAVE_GMTIME_R
gmt = *gmtime_r(&now, &gmt);
-#elif
FEATURE_PTHREAD
+#elif
defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&gmtime_mutex);
gmt = *gmtime(&now);
privoxy_mutex_unlock(&gmtime_mutex);
privoxy_mutex_lock(&gmtime_mutex);
gmt = *gmtime(&now);
privoxy_mutex_unlock(&gmtime_mutex);
@@
-494,7
+493,7
@@
static inline size_t get_clf_timestamp(char *buffer, size_t buffer_size)
#endif
#ifdef HAVE_LOCALTIME_R
tm_now = localtime_r(&now, &dummy);
#endif
#ifdef HAVE_LOCALTIME_R
tm_now = localtime_r(&now, &dummy);
-#elif
FEATURE_PTHREAD
+#elif
defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&localtime_mutex);
tm_now = localtime(&now);
privoxy_mutex_unlock(&localtime_mutex);
privoxy_mutex_lock(&localtime_mutex);
tm_now = localtime(&now);
privoxy_mutex_unlock(&localtime_mutex);
@@
-574,11
+573,9
@@
static inline const char *get_log_level_string(int loglevel)
log_level_string = "Force";
break;
#endif /* def FEATURE_FORCE_LOAD */
log_level_string = "Force";
break;
#endif /* def FEATURE_FORCE_LOAD */
-#ifdef FEATURE_FAST_REDIRECTS
case LOG_LEVEL_REDIRECTS:
log_level_string = "Redirect";
break;
case LOG_LEVEL_REDIRECTS:
log_level_string = "Redirect";
break;
-#endif /* def FEATURE_FAST_REDIRECTS */
case LOG_LEVEL_DEANIMATE:
log_level_string = "Gif-Deanimate";
break;
case LOG_LEVEL_DEANIMATE:
log_level_string = "Gif-Deanimate";
break;