mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

[CLEANUP] added the correct cast to call localtime()

Browse Source 
Calling localtime() with a timeval.tv_sec causes a warning on
OpenBSD where the tv_sec is declared long.
This commit is contained in:
Willy Tarreau 2006-10-15 22:54:47 +02:00
parent fb278677e2
commit bf73613543
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/haproxy.c
View File

@ -349,7 +349,7 @@ void init(int argc, char **argv)
* Also, the Alert() and Warning() functions need <now> to be initialized. * Also, the Alert() and Warning() functions need <now> to be initialized.
*/ */
tv_now(&now); tv_now(&now);
localtime(&now.tv_sec); localtime((time_t *)&now.tv_sec);
start_date = now; start_date = now;
init_log(); init_log();

8
src/log.c
View File

@ -73,7 +73,7 @@ void Alert(const char *fmt, ...)
if (!(global.mode & MODE_QUIET) || (global.mode & (MODE_VERBOSE | MODE_STARTING))) { if (!(global.mode & MODE_QUIET) || (global.mode & (MODE_VERBOSE | MODE_STARTING))) {
va_start(argp, fmt); va_start(argp, fmt);
tm = localtime(&now.tv_sec); tm = localtime((time_t *)&now.tv_sec);
fprintf(stderr, "[ALERT] %03d/%02d%02d%02d (%d) : ", fprintf(stderr, "[ALERT] %03d/%02d%02d%02d (%d) : ",
tm->tm_yday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)getpid()); tm->tm_yday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)getpid());
vfprintf(stderr, fmt, argp); vfprintf(stderr, fmt, argp);
@ -94,7 +94,7 @@ void Warning(const char *fmt, ...)
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) { if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) {
va_start(argp, fmt); va_start(argp, fmt);
tm = localtime(&now.tv_sec); tm = localtime((time_t *)&now.tv_sec);
fprintf(stderr, "[WARNING] %03d/%02d%02d%02d (%d) : ", fprintf(stderr, "[WARNING] %03d/%02d%02d%02d (%d) : ",
tm->tm_yday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)getpid()); tm->tm_yday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)getpid());
vfprintf(stderr, fmt, argp); vfprintf(stderr, fmt, argp);
@ -194,7 +194,7 @@ void send_log(struct proxy *p, int level, const char *message, ...)
if (now.tv_sec != tvsec || dataptr == NULL) { if (now.tv_sec != tvsec || dataptr == NULL) {
/* this string is rebuild only once a second */ /* this string is rebuild only once a second */
struct tm *tm = localtime(&now.tv_sec); struct tm *tm = localtime((time_t *)&now.tv_sec);
tvsec = now.tv_sec; tvsec = now.tv_sec;
hdr_len = snprintf(logmsg, sizeof(logmsg), hdr_len = snprintf(logmsg, sizeof(logmsg),
@ -317,7 +317,7 @@ void sess_log(struct session *s)
(s->data_source != DATA_SRC_STATS) ? (s->data_source != DATA_SRC_STATS) ?
(s->srv != NULL) ? s->srv->id : "<NOSRV>" : "<STATS>" : "-"; (s->srv != NULL) ? s->srv->id : "<NOSRV>" : "<STATS>" : "-";
tm = localtime(&s->logs.tv_accept.tv_sec); tm = localtime((time_t *)&s->logs.tv_accept.tv_sec);
if (p->to_log & LW_REQ) { if (p->to_log & LW_REQ) {
char tmpline[MAX_SYSLOG_LEN], *h; char tmpline[MAX_SYSLOG_LEN], *h;
int hdr; int hdr;