buckets.c | buckets.c | |||
---|---|---|---|---|
skipping to change at line 518 | skipping to change at line 518 | |||
*/ | */ | |||
if (status || linebuf->state == SERF_LINEBUF_READY) | if (status || linebuf->state == SERF_LINEBUF_READY) | |||
return status; | return status; | |||
/* We got APR_SUCCESS and the line buffer is not complete. Let's | /* We got APR_SUCCESS and the line buffer is not complete. Let's | |||
* loop to read some more data. | * loop to read some more data. | |||
*/ | */ | |||
} | } | |||
/* NOTREACHED */ | /* NOTREACHED */ | |||
} | } | |||
/* Logging functions. | ||||
Use with one of the [COMP]_VERBOSE defines so that the compiler knows to | ||||
optimize this code out when no logging is needed. */ | ||||
static void log_time() | ||||
{ | ||||
apr_time_exp_t tm; | ||||
apr_time_exp_lt(&tm, apr_time_now()); | ||||
fprintf(stderr, "[%d-%02d-%02dT%02d:%02d:%02d.%06d%+03d] ", | ||||
1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday, | ||||
tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, | ||||
tm.tm_gmtoff/3600); | ||||
} | ||||
void serf__log(int verbose_flag, const char *filename, const char *fmt, ... | ||||
) | ||||
{ | ||||
va_list argp; | ||||
if (verbose_flag) { | ||||
log_time(); | ||||
if (filename) | ||||
fprintf(stderr, "%s: ", filename); | ||||
va_start(argp, fmt); | ||||
vfprintf(stderr, fmt, argp); | ||||
va_end(argp); | ||||
} | ||||
} | ||||
void serf__log_nopref(int verbose_flag, const char *fmt, ...) | ||||
{ | ||||
va_list argp; | ||||
if (verbose_flag) { | ||||
va_start(argp, fmt); | ||||
vfprintf(stderr, fmt, argp); | ||||
va_end(argp); | ||||
} | ||||
} | ||||
void serf__log_skt(int verbose_flag, const char *filename, apr_socket_t *sk | ||||
t, | ||||
const char *fmt, ...) | ||||
{ | ||||
va_list argp; | ||||
if (verbose_flag) { | ||||
apr_sockaddr_t *sa; | ||||
log_time(); | ||||
if (skt) { | ||||
/* Log local and remote ip address:port */ | ||||
fprintf(stderr, "[l:"); | ||||
if (apr_socket_addr_get(&sa, APR_LOCAL, skt) == APR_SUCCESS) { | ||||
char buf[32]; | ||||
apr_sockaddr_ip_getbuf(buf, 32, sa); | ||||
fprintf(stderr, "%s:%d", buf, sa->port); | ||||
} | ||||
fprintf(stderr, " r:"); | ||||
if (apr_socket_addr_get(&sa, APR_REMOTE, skt) == APR_SUCCESS) { | ||||
char buf[32]; | ||||
apr_sockaddr_ip_getbuf(buf, 32, sa); | ||||
fprintf(stderr, "%s:%d", buf, sa->port); | ||||
} | ||||
fprintf(stderr, "] "); | ||||
} | ||||
if (filename) | ||||
fprintf(stderr, "%s: ", filename); | ||||
va_start(argp, fmt); | ||||
vfprintf(stderr, fmt, argp); | ||||
va_end(argp); | ||||
} | ||||
} | ||||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 0 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |