projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
648433c
)
Use (a != b) instead of !(a == b) so the sanity check looks less insane.
author
Fabian Keil
<fk@fabiankeil.de>
Thu, 31 Jan 2008 14:44:33 +0000
(14:44 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Thu, 31 Jan 2008 14:44:33 +0000
(14:44 +0000)
errlog.c
patch
|
blob
|
history
diff --git
a/errlog.c
b/errlog.c
index
e3644fd
..
0275f6b
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.6
3 2007/12/15 19:49:32 fabiankeil
Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.6
4 2008/01/21 18:56:46 david__schmidt
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@
-33,6
+33,9
@@
const char errlog_rcs[] = "$Id: errlog.c,v 1.63 2007/12/15 19:49:32 fabiankeil E
*
* Revisions :
* $Log: errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.64 2008/01/21 18:56:46 david__schmidt
+ * Swap #def from negative to positive, re-joined it so it didn't span an assertion (compilation failure on OS/2)
+ *
* Revision 1.63 2007/12/15 19:49:32 fabiankeil
* Stop overloading logfile to control the mingw32 log window as well.
* It's no longer necessary now that we disable all debug lines by default
* Revision 1.63 2007/12/15 19:49:32 fabiankeil
* Stop overloading logfile to control the mingw32 log window as well.
* It's no longer necessary now that we disable all debug lines by default
@@
-1134,9
+1137,9
@@
void log_error(int loglevel, const char *fmt, ...)
length += strlcpy(outbuf + length, "\n", log_buffer_size - length);
/* Some sanity checks */
length += strlcpy(outbuf + length, "\n", log_buffer_size - length);
/* Some sanity checks */
- if (
!(length <
log_buffer_size)
- ||
!(outbuf[log_buffer_size-1] =
= '\0')
- ||
!(outbuf[log_buffer_size] =
= '\0')
+ if (
(length >=
log_buffer_size)
+ ||
(outbuf[log_buffer_size-1] !
= '\0')
+ ||
(outbuf[log_buffer_size] !
= '\0')
)
{
/* Repeat as assertions */
)
{
/* Repeat as assertions */