projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor style fix for listen_loop().
[privoxy.git]
/
errlog.c
diff --git
a/errlog.c
b/errlog.c
index
41cc453
..
416b87d
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.1
05 2010/07/26 11:20:53
fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.1
10 2010/07/26 12:11:51
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@
-450,7
+450,7
@@
static inline size_t get_log_timestamp(char *buffer, size_t buffer_size)
tm_now = *localtime(&now);
#endif
tm_now = *localtime(&now);
#endif
- length = strftime(buffer, buffer_size, "%
b
%d %H:%M:%S", &tm_now);
+ length = strftime(buffer, buffer_size, "%
Y-%m-
%d %H:%M:%S", &tm_now);
if (length > (size_t)0)
{
msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
if (length > (size_t)0)
{
msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
@@
-572,9
+572,12
@@
static inline const char *get_log_level_string(int loglevel)
case LOG_LEVEL_CONNECT:
log_level_string = "Connect";
break;
case LOG_LEVEL_CONNECT:
log_level_string = "Connect";
break;
- case LOG_LEVEL_
LO
G:
+ case LOG_LEVEL_
WRITIN
G:
log_level_string = "Writing";
break;
log_level_string = "Writing";
break;
+ case LOG_LEVEL_RECEIVED:
+ log_level_string = "Received";
+ break;
case LOG_LEVEL_HEADER:
log_level_string = "Header";
break;
case LOG_LEVEL_HEADER:
log_level_string = "Header";
break;
@@
-807,8
+810,9
@@
void log_error(int loglevel, const char *fmt, ...)
}
else
{
}
else
{
- snprintf(outbuf + length, log_buffer_size - length - 2,
- "\\x%.2x", (int)*sval);
+ int ret = snprintf(outbuf + length,
+ log_buffer_size - length - 2, "\\x%.2x", (unsigned char)*sval);
+ assert(ret == 4);
length += 4;
}
sval++;
length += 4;
}
sval++;