[MINOR] fix several printf formats and missing arguments

[cherry-picked from commit 1772ece0252fa517ace6c554ee77ca09c3dda7e8]

Last patch revealed a number of mistakes in printf-like calls, mostly int/long
mismatches, and a few missing arguments.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 2d226baf03211243e482297ab848a1b68d440c33..478b7fb346809d3287a60a238f4b97865db94908 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -361,7 +361,7 @@ int cfg_parse_global(const char *file, int linenum, char **args, int inv)
        else if (!strcmp(args[0], "group")) {
                struct group *ha_group;
                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;
                }
                errno = 0;
@@ -2498,7 +2498,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
                        return 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;
                }
 
@@ -2536,7 +2536,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
                        return 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;
                }
 
@@ -3030,8 +3030,8 @@ int readcfgfile(const char *file)
                newsrv = curproxy->srv;
                while (newsrv != NULL) {
                        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",
-                                     file, proxy_type_str(curproxy), curproxy->id, linenum);
+                               Alert("parsing [%s:%d] : %s '%s' : server cannot have cookie or redirect prefix in non-HTTP mode.\n",
+                                     file, linenum, proxy_type_str(curproxy), curproxy->id);
                                goto err;
                        }
                        newsrv = newsrv->next;
@@ -3054,8 +3054,8 @@ int readcfgfile(const char *file)
                                /* minconn was not specified, so we set it to maxconn */
                                newsrv->minconn = newsrv->maxconn;
                        } else if (newsrv->minconn != newsrv->maxconn && !curproxy->fullconn) {
-                               Alert("parsing %s, %s '%s' : fullconn is mandatory when minconn is set on a server.\n",
-                                     file, proxy_type_str(curproxy), curproxy->id, linenum);
+                               Alert("parsing [%s:%d] : %s '%s' : fullconn is mandatory when minconn is set on a server.\n",
+                                     file, linenum, proxy_type_str(curproxy), curproxy->id);
                                goto err;
                        }
 

diff --git a/src/checks.c b/src/checks.c
index a0bca95ca2820206ec7c3e794d815f119313fe6d..fd21e0de38e91cd72d5efe017e38e556b51c98a7 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -224,7 +224,7 @@ static void set_server_up(struct server *s) {
                        " %d sessions requeued, %d total in queue.\n",
                        s->proxy->srv_act, s->proxy->srv_bck,
                        (s->proxy->srv_bck && !s->proxy->srv_act) ? " Running on backup." : "",
-                       s->cur_sess, xferred, s->nbpend);
+                       xferred, s->nbpend);
 
                Warning("%s", trash);
                send_log(s->proxy, LOG_NOTICE, "%s", trash);

diff --git a/src/dumpstats.c b/src/dumpstats.c
index ddadddd1d69e53c59945f81482c21d142fe1cbea..894c2487d8b556e43dc5bad552346e09e7130b6b 100644 (file)
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -908,7 +908,7 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
                                        chunk_printf(&msg, sizeof(trash),
                                             "%d,%d,%d,%d,",
                                             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
                                        chunk_printf(&msg, sizeof(trash),
                                             ",,,,");
@@ -1034,7 +1034,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 * px->lbprm.wmult + px->lbprm.wdiv - 1) / px->lbprm.wdiv,
                                     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,
                                     relative_pid, px->uuid,
                                     px->cum_lbconn, STATS_TYPE_BE);

diff --git a/src/haproxy.c b/src/haproxy.c
index b53608c80eeb6a22ee96b92acb979e298cf06e09..0db898994ab798cc680ca8ca89a8120d0a5d484a 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1027,7 +1027,7 @@ int main(int argc, char **argv)
        getrlimit(RLIMIT_NOFILE, &limit);
        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",
-                       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) {

diff --git a/src/log.c b/src/log.c
index 8888aa88f4819db9f7a79cf0d3beae95ff0508da..7de6ef4fdcc8b16e86e7e6f9bc366c4ae5a45f78 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -355,14 +355,14 @@ void tcp_sess_log(struct session *s)
        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]"
-                " %s %s/%s %d/%d/%s%d %s%lld"
-                " %c%c %d/%d/%d/%d/%s%u %d/%d\n",
+                " %s %s/%s %ld/%ld/%s%ld %s%lld"
+                " %c%c %d/%d/%d/%d/%s%u %ld/%ld\n",
                 pn,
                 (s->cli_addr.ss_family == AF_INET) ?
                 ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
                 ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port),
                 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,
                 (s->logs.t_queue >= 0) ? s->logs.t_queue : -1,
                 (s->logs.t_connect >= 0) ? s->logs.t_connect - s->logs.t_queue : -1,

diff --git a/src/memory.c b/src/memory.c
index b157cf0a06b5f732e0465cbb618bca447343267c..7948bf2ff2473cf73c7630f273cc9efef9f37ced 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -174,7 +174,7 @@ void dump_pools(void)
        allocated = used = nbpools = 0;
        qfprintf(stderr, "Dumping pools usage.\n");
        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->size * entry->allocated, entry->used,
                         entry->users, (entry->flags & MEM_F_SHARED) ? " [SHARED]" : "");

diff --git a/src/proto_http.c b/src/proto_http.c
index 0a59fe1578a5d379733c044fd61166eecb173b81..d7a3277869d3760e995a6f31d8d59b160eee665d 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -822,14 +822,14 @@ static void http_sess_log(struct session *s)
 
        send_log(prx_log, LOG_INFO,
                 "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
-                " %s %s/%s %d/%d/%d/%d/%s%d %d %s%lld"
-                " %s %s %c%c%c%c %d/%d/%d/%d/%s%u %d/%d%s\n",
+                " %s %s/%s %d/%ld/%ld/%ld/%s%ld %d %s%lld"
+                " %s %s %c%c%c%c %d/%d/%d/%d/%s%u %ld/%ld%s\n",
                 pn,
                 (s->cli_addr.ss_family == AF_INET) ?
                 ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
                 ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port),
                 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,
                 t_request,
                 (s->logs.t_queue >= 0) ? s->logs.t_queue - t_request : -1,