projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs should have an author.
[privoxy.git]
/
errlog.c
diff --git
a/errlog.c
b/errlog.c
index
ae98ed3
..
3832dbd
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.1
0 2001/05/29 11:52:21 oes
Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.1
1 2001/06/01 18:14:49 jongfoster
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@
-33,6
+33,10
@@
const char errlog_rcs[] = "$Id: errlog.c,v 1.10 2001/05/29 11:52:21 oes Exp $";
*
* Revisions :
* $Log: errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.11 2001/06/01 18:14:49 jongfoster
+ * Changing the calls to strerr() to check HAVE_STRERR (which is defined
+ * in config.h if appropriate) rather than the NO_STRERR macro.
+ *
* Revision 1.10 2001/05/29 11:52:21 oes
* Conditional compilation of w32_socket_error
*
* Revision 1.10 2001/05/29 11:52:21 oes
* Conditional compilation of w32_socket_error
*
@@
-262,7
+266,7
@@
void init_error_log(const char *prog_name, const char *logfname, int debuglevel)
void log_error(int loglevel, char *fmt, ...)
{
va_list ap;
void log_error(int loglevel, char *fmt, ...)
{
va_list ap;
- char outbuf[BUF
SIZ
];
+ char outbuf[BUF
FER_SIZE
];
char * src = fmt;
int outc = 0;
long this_thread = 1; /* was: pthread_t this_thread;*/
char * src = fmt;
int outc = 0;
long this_thread = 1; /* was: pthread_t this_thread;*/
@@
-339,9
+343,9
@@
void log_error(int loglevel, char *fmt, ...)
va_start( ap, fmt );
/* build formatted message from fmt and var-args */
va_start( ap, fmt );
/* build formatted message from fmt and var-args */
- while ((*src) && (outc < BUF
SIZ
-2))
+ while ((*src) && (outc < BUF
FER_SIZE
-2))
{
{
- char tempbuf[BUF
SIZ
];
+ char tempbuf[BUF
FER_SIZE
];
char *sval;
int ival;
unsigned uval;
char *sval;
int ival;
unsigned uval;
@@
-366,7
+370,7
@@
void log_error(int loglevel, char *fmt, ...)
ival = va_arg( ap, int );
oldoutc = outc;
outc += sprintf(tempbuf, "%d", ival);
ival = va_arg( ap, int );
oldoutc = outc;
outc += sprintf(tempbuf, "%d", ival);
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
strcpy(outbuf + oldoutc, tempbuf);
}
{
strcpy(outbuf + oldoutc, tempbuf);
}
@@
-379,7
+383,7
@@
void log_error(int loglevel, char *fmt, ...)
uval = va_arg( ap, unsigned );
oldoutc = outc;
outc += sprintf(tempbuf, "%u", uval);
uval = va_arg( ap, unsigned );
oldoutc = outc;
outc += sprintf(tempbuf, "%u", uval);
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
strcpy(outbuf + oldoutc, tempbuf);
}
{
strcpy(outbuf + oldoutc, tempbuf);
}
@@
-420,7
+424,7
@@
void log_error(int loglevel, char *fmt, ...)
/* Never get here */
break;
}
/* Never get here */
break;
}
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
strcpy(outbuf + oldoutc, tempbuf);
}
{
strcpy(outbuf + oldoutc, tempbuf);
}
@@
-440,7
+444,7
@@
void log_error(int loglevel, char *fmt, ...)
sval = va_arg( ap, char * );
oldoutc = outc;
outc += strlen(sval);
sval = va_arg( ap, char * );
oldoutc = outc;
outc += strlen(sval);
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
strcpy(outbuf + oldoutc, sval);
}
{
strcpy(outbuf + oldoutc, sval);
}
@@
-461,7
+465,7
@@
void log_error(int loglevel, char *fmt, ...)
}
oldoutc = outc;
outc += ival;
}
oldoutc = outc;
outc += ival;
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
memcpy(outbuf + oldoutc, sval, ival);
}
{
memcpy(outbuf + oldoutc, sval, ival);
}
@@
-490,7
+494,7
@@
void log_error(int loglevel, char *fmt, ...)
#endif /* ndef _WIN32 */
oldoutc = outc;
outc += strlen(sval);
#endif /* ndef _WIN32 */
oldoutc = outc;
outc += strlen(sval);
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
strcpy(outbuf + oldoutc, sval);
}
{
strcpy(outbuf + oldoutc, sval);
}
@@
-518,12
+522,12
@@
void log_error(int loglevel, char *fmt, ...)
days = tm_now->tm_yday - gmt.tm_yday;
hrs = ((days < -1 ? 24 : 1 < days ? -24 : days * 24) + tm_now->tm_hour - gmt.tm_hour);
mins = hrs * 60 + tm_now->tm_min - gmt.tm_min;
days = tm_now->tm_yday - gmt.tm_yday;
hrs = ((days < -1 ? 24 : 1 < days ? -24 : days * 24) + tm_now->tm_hour - gmt.tm_hour);
mins = hrs * 60 + tm_now->tm_min - gmt.tm_min;
- strftime (tempbuf, BUF
SIZ
-6, "%d/%b/%Y:%H:%M:%S ", tm_now);
+ strftime (tempbuf, BUF
FER_SIZE
-6, "%d/%b/%Y:%H:%M:%S ", tm_now);
sprintf (tempbuf + strlen(tempbuf), "%+03d%02d", mins / 60, abs(mins) % 60);
}
oldoutc = outc;
outc += strlen(tempbuf);
sprintf (tempbuf + strlen(tempbuf), "%+03d%02d", mins / 60, abs(mins) % 60);
}
oldoutc = outc;
outc += strlen(tempbuf);
- if (outc < BUF
SIZ
-1)
+ if (outc < BUF
FER_SIZE
-1)
{
strcpy(outbuf + oldoutc, tempbuf);
}
{
strcpy(outbuf + oldoutc, tempbuf);
}
@@
-554,20
+558,20
@@
void log_error(int loglevel, char *fmt, ...)
/* done with var. args */
va_end( ap );
/* done with var. args */
va_end( ap );
- if (outc >= BUF
SIZ
-2)
+ if (outc >= BUF
FER_SIZE
-2)
{
/* insufficient room for newline and trailing null. */
static const char warning[] = "... [too long, truncated]\n";
{
/* insufficient room for newline and trailing null. */
static const char warning[] = "... [too long, truncated]\n";
- if (outc < BUF
SIZ
)
+ if (outc < BUF
FER_SIZE
)
{
/* Need to add terminating null in this case. */
outbuf[outc] = '\0';
}
/* Truncate output */
{
/* Need to add terminating null in this case. */
outbuf[outc] = '\0';
}
/* Truncate output */
- outbuf[BUF
SIZ
- sizeof(warning)] = '\0';
+ outbuf[BUF
FER_SIZE
- sizeof(warning)] = '\0';
/* Append warning */
strcat(outbuf, warning);
/* Append warning */
strcat(outbuf, warning);