mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] fix several printf formats and missing arguments

Browse Source 
Last patch revealed a number of mistakes in printf-like calls, mostly int/long
mismatches, and a few missing arguments.
This commit is contained in:
Willy Tarreau 2009-04-03 14:49:12 +02:00
parent 40d2516371
commit 1772ece025
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cfgparse.c
View File

@ -463,7 +463,7 @@ int cfg_parse_global(const char *file, int linenum, char **args, int inv)
else if (!strcmp(args[0], "group")) { else if (!strcmp(args[0], "group")) {
struct group *ha_group; struct group *ha_group;
if (global.gid != 0) { if (global.gid != 0) {
Alert("parsing [%s:%d] : gid/group was already specified. Continuing.\n", file, linenum, args[0]); Alert("parsing [%s:%d] : gid/group was already specified. Continuing.\n", file, linenum);
return 0; return 0;
} }
errno = 0; errno = 0;
@ -2938,7 +2938,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
return 0; return 0;
if (*(args[2]) == 0) { if (*(args[2]) == 0) {
Alert("parsing [%s:%d] : <%s> expects <status_code> and <url> as arguments.\n", file, linenum); Alert("parsing [%s:%d] : <%s> expects <status_code> and <url> as arguments.\n", file, linenum, args[0]);
return -1; return -1;
} }
@ -2975,7 +2975,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
return 0; return 0;
if (*(args[2]) == 0) { if (*(args[2]) == 0) {
Alert("parsing [%s:%d] : <%s> expects <status_code> and <file> as arguments.\n", file, linenum); Alert("parsing [%s:%d] : <%s> expects <status_code> and <file> as arguments.\n", file, linenum, args[0]);
return -1; return -1;
} }
@ -3506,8 +3506,8 @@ int readcfgfile(const char *file)
newsrv = curproxy->srv; newsrv = curproxy->srv;
while (newsrv != NULL) { while (newsrv != NULL) {
if ((curproxy->mode != PR_MODE_HTTP) && (newsrv->rdr_len || newsrv->cklen)) { if ((curproxy->mode != PR_MODE_HTTP) && (newsrv->rdr_len || newsrv->cklen)) {
Alert("parsing %s, %s '%s' : server cannot have cookie or redirect prefix in non-HTTP mode.\n", Alert("parsing [%s:%d] : %s '%s' : server cannot have cookie or redirect prefix in non-HTTP mode.\n",
file, proxy_type_str(curproxy), curproxy->id, linenum); file, linenum, proxy_type_str(curproxy), curproxy->id);
goto err; goto err;
} }
newsrv = newsrv->next; newsrv = newsrv->next;
@ -3530,8 +3530,8 @@ int readcfgfile(const char *file)
/* minconn was not specified, so we set it to maxconn */ /* minconn was not specified, so we set it to maxconn */
newsrv->minconn = newsrv->maxconn; newsrv->minconn = newsrv->maxconn;
} else if (newsrv->minconn != newsrv->maxconn && !curproxy->fullconn) { } else if (newsrv->minconn != newsrv->maxconn && !curproxy->fullconn) {
Alert("parsing %s, %s '%s' : fullconn is mandatory when minconn is set on a server.\n", Alert("parsing [%s:%d] : %s '%s' : fullconn is mandatory when minconn is set on a server.\n",
file, proxy_type_str(curproxy), curproxy->id, linenum); file, linenum, proxy_type_str(curproxy), curproxy->id);
goto err; goto err;
} }

2
src/checks.c
View File

@ -221,7 +221,7 @@ static void set_server_up(struct server *s) {
" %d sessions requeued, %d total in queue.\n", " %d sessions requeued, %d total in queue.\n",
s->proxy->srv_act, s->proxy->srv_bck, s->proxy->srv_act, s->proxy->srv_bck,
(s->proxy->srv_bck && !s->proxy->srv_act) ? " Running on backup." : "", (s->proxy->srv_bck && !s->proxy->srv_act) ? " Running on backup." : "",
s->cur_sess, xferred, s->nbpend); xferred, s->nbpend);
Warning("%s", trash); Warning("%s", trash);
send_log(s->proxy, LOG_NOTICE, "%s", trash); send_log(s->proxy, LOG_NOTICE, "%s", trash);

6
src/dumpstats.c
View File

@ -944,7 +944,7 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
chunk_printf(&msg, sizeof(trash), chunk_printf(&msg, sizeof(trash),
"%d,%d,%d,%d,", "%d,%d,%d,%d,",
sv->failed_checks, sv->down_trans, sv->failed_checks, sv->down_trans,
now.tv_sec - sv->last_change, srv_downtime(sv)); (int)(now.tv_sec - sv->last_change), srv_downtime(sv));
else else
chunk_printf(&msg, sizeof(trash), chunk_printf(&msg, sizeof(trash),
",,,,"); ",,,,");
@ -1084,7 +1084,7 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
(px->lbprm.tot_weight > 0 || !px->srv) ? "UP" : "DOWN", (px->lbprm.tot_weight > 0 || !px->srv) ? "UP" : "DOWN",
(px->lbprm.tot_weight * px->lbprm.wmult + px->lbprm.wdiv - 1) / px->lbprm.wdiv, (px->lbprm.tot_weight * px->lbprm.wmult + px->lbprm.wdiv - 1) / px->lbprm.wdiv,
px->srv_act, px->srv_bck, px->srv_act, px->srv_bck,
px->down_trans, now.tv_sec - px->last_change, px->down_trans, (int)(now.tv_sec - px->last_change),
px->srv?be_downtime(px):0, px->srv?be_downtime(px):0,
relative_pid, px->uuid, relative_pid, px->uuid,
px->cum_lbconn, STATS_TYPE_BE, px->cum_lbconn, STATS_TYPE_BE,
@ -1437,7 +1437,7 @@ void stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
get_localtime(es->when.tv_sec, &tm); get_localtime(es->when.tv_sec, &tm);
chunk_printf(&msg, sizeof(trash), "\n[%02d/%s/%04d:%02d:%02d:%02d.%03d]", chunk_printf(&msg, sizeof(trash), "\n[%02d/%s/%04d:%02d:%02d:%02d.%03d]",
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900, tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
tm.tm_hour, tm.tm_min, tm.tm_sec, es->when.tv_usec/1000); tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(es->when.tv_usec/1000));
if (es->src.ss_family == AF_INET) if (es->src.ss_family == AF_INET)

2
src/haproxy.c
View File

@ -1105,7 +1105,7 @@ int main(int argc, char **argv)
getrlimit(RLIMIT_NOFILE, &limit); getrlimit(RLIMIT_NOFILE, &limit);
if (limit.rlim_cur < global.maxsock) { if (limit.rlim_cur < global.maxsock) {
Warning("[%s.main()] FD limit (%d) too low for maxconn=%d/maxsock=%d. Please raise 'ulimit-n' to %d or more to avoid any trouble.\n", Warning("[%s.main()] FD limit (%d) too low for maxconn=%d/maxsock=%d. Please raise 'ulimit-n' to %d or more to avoid any trouble.\n",
argv[0], limit.rlim_cur, global.maxconn, global.maxsock, global.maxsock); argv[0], (int)limit.rlim_cur, global.maxconn, global.maxsock, global.maxsock);
} }
if (global.mode & MODE_DAEMON) { if (global.mode & MODE_DAEMON) {

6
src/log.c
View File

@ -354,14 +354,14 @@ void tcp_sess_log(struct session *s)
svid = (tolog & LW_SVID) ? (s->srv != NULL) ? s->srv->id : "<NOSRV>" : "-"; svid = (tolog & LW_SVID) ? (s->srv != NULL) ? s->srv->id : "<NOSRV>" : "-";
send_log(prx_log, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]" send_log(prx_log, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
" %s %s/%s %d/%d/%s%d %s%lld" " %s %s/%s %ld/%ld/%s%ld %s%lld"
" %c%c %d/%d/%d/%d/%s%u %d/%d\n", " %c%c %d/%d/%d/%d/%s%u %ld/%ld\n",
pn, pn,
(s->cli_addr.ss_family == AF_INET) ? (s->cli_addr.ss_family == AF_INET) ?
ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) : ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port), ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port),
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900, tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
tm.tm_hour, tm.tm_min, tm.tm_sec, s->logs.tv_accept.tv_usec/1000, tm.tm_hour, tm.tm_min, tm.tm_sec, (int)s->logs.tv_accept.tv_usec/1000,
fe->id, be->id, svid, fe->id, be->id, svid,
(s->logs.t_queue >= 0) ? s->logs.t_queue : -1, (s->logs.t_queue >= 0) ? s->logs.t_queue : -1,
(s->logs.t_connect >= 0) ? s->logs.t_connect - s->logs.t_queue : -1, (s->logs.t_connect >= 0) ? s->logs.t_connect - s->logs.t_queue : -1,

2
src/memory.c
View File

@ -176,7 +176,7 @@ void dump_pools(void)
allocated = used = nbpools = 0; allocated = used = nbpools = 0;
qfprintf(stderr, "Dumping pools usage.\n"); qfprintf(stderr, "Dumping pools usage.\n");
list_for_each_entry(entry, &pools, list) { list_for_each_entry(entry, &pools, list) {
qfprintf(stderr, " - Pool %s (%d bytes) : %d allocated (%lu bytes), %d used, %d users%s\n", qfprintf(stderr, " - Pool %s (%d bytes) : %d allocated (%u bytes), %d used, %d users%s\n",
entry->name, entry->size, entry->allocated, entry->name, entry->size, entry->allocated,
entry->size * entry->allocated, entry->used, entry->size * entry->allocated, entry->used,
entry->users, (entry->flags & MEM_F_SHARED) ? " [SHARED]" : ""); entry->users, (entry->flags & MEM_F_SHARED) ? " [SHARED]" : "");

6
src/proto_http.c
View File

@ -831,14 +831,14 @@ void http_sess_log(struct session *s)
send_log(prx_log, LOG_INFO, send_log(prx_log, LOG_INFO,
"%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]" "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
" %s %s/%s %d/%d/%d/%d/%s%d %d %s%lld" " %s %s/%s %d/%ld/%ld/%ld/%s%ld %d %s%lld"
" %s %s %c%c%c%c %d/%d/%d/%d/%s%u %d/%d%s\n", " %s %s %c%c%c%c %d/%d/%d/%d/%s%u %ld/%ld%s\n",
pn, pn,
(s->cli_addr.ss_family == AF_INET) ? (s->cli_addr.ss_family == AF_INET) ?
ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) : ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port), ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port),
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900, tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
tm.tm_hour, tm.tm_min, tm.tm_sec, s->logs.accept_date.tv_usec/1000, tm.tm_hour, tm.tm_min, tm.tm_sec, (int)s->logs.accept_date.tv_usec/1000,
fe->id, be->id, svid, fe->id, be->id, svid,
t_request, t_request,
(s->logs.t_queue >= 0) ? s->logs.t_queue - t_request : -1, (s->logs.t_queue >= 0) ? s->logs.t_queue - t_request : -1,