projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebuilt after standard.action file removal.
[privoxy.git]
/
errlog.c
diff --git
a/errlog.c
b/errlog.c
index
71920c7
..
22f5ae4
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.8
1 2008/11/23 15:59:27
fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.8
3 2008/12/04 18:14:32
fabiankeil 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.81 2008/11/23 15:59:27 fabiankeil E
*
* Revisions :
* $Log: errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.83 2008/12/04 18:14:32 fabiankeil
+ * Fix some cparser warnings.
+ *
+ * Revision 1.82 2008/11/23 16:06:58 fabiankeil
+ * Update a log message I missed in 1.80.
+ *
* Revision 1.81 2008/11/23 15:59:27 fabiankeil
* - Update copyright range.
* - Remove stray line breaks in a log message
* Revision 1.81 2008/11/23 15:59:27 fabiankeil
* - Update copyright range.
* - Remove stray line breaks in a log message
@@
-803,7
+809,7
@@
static inline size_t get_log_timestamp(char *buffer, size_t buffer_size)
#endif
length = strftime(buffer, buffer_size, "%b %d %H:%M:%S", &tm_now);
#endif
length = strftime(buffer, buffer_size, "%b %d %H:%M:%S", &tm_now);
- if (length > 0)
+ if (length >
(size_t)
0)
{
msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
}
{
msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
}
@@
-874,7
+880,7
@@
static inline size_t get_clf_timestamp(char *buffer, size_t buffer_size)
length = strftime(buffer, buffer_size, "%d/%b/%Y:%H:%M:%S ", tm_now);
length = strftime(buffer, buffer_size, "%d/%b/%Y:%H:%M:%S ", tm_now);
- if (length > 0)
+ if (length >
(size_t)
0)
{
tz_length = snprintf(buffer+length, buffer_size-length,
"%+03d%02d", mins / 60, abs(mins) % 60);
{
tz_length = snprintf(buffer+length, buffer_size-length,
"%+03d%02d", mins / 60, abs(mins) % 60);
@@
-949,6
+955,9
@@
static inline const char *get_log_level_string(int loglevel)
case LOG_LEVEL_DEANIMATE:
log_level_string = "Gif-Deanimate";
break;
case LOG_LEVEL_DEANIMATE:
log_level_string = "Gif-Deanimate";
break;
+ case LOG_LEVEL_CRUNCH:
+ log_level_string = "Crunch";
+ break;
case LOG_LEVEL_CGI:
log_level_string = "CGI";
break;
case LOG_LEVEL_CGI:
log_level_string = "CGI";
break;
@@
-999,7
+1008,7
@@
void log_error(int loglevel, const char *fmt, ...)
* the taskbar icon animate. (There is an option to disable
* this but checking that is handled inside LogShowActivity()).
*/
* the taskbar icon animate. (There is an option to disable
* this but checking that is handled inside LogShowActivity()).
*/
- if (
loglevel == LOG_LEVEL_GPC
)
+ if (
(loglevel == LOG_LEVEL_GPC) || (loglevel == LOG_LEVEL_CRUNCH)
)
{
LogShowActivity();
}
{
LogShowActivity();
}
@@
-1153,7
+1162,7
@@
void log_error(int loglevel, const char *fmt, ...)
format_string = "[counted string lenght < 0]";
}
}
format_string = "[counted string lenght < 0]";
}
}
- else if (ival >= sizeof(tempbuf))
+ else if (
(size_t)
ival >= sizeof(tempbuf))
{
/*
* String is too long, copy as much as possible.
{
/*
* String is too long, copy as much as possible.