From: Willy Tarreau Date: Sat, 22 Jun 2019 05:41:38 +0000 (+0200) Subject: BUILD: mworker: silence two printf format warnings around getpid() X-Git-Tag: v2.1-dev1~68 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76a80c710cbd8ca3d7dcd191d26cc7a450dee22e;p=thirdparty%2Fhaproxy.git BUILD: mworker: silence two printf format warnings around getpid() getpid() is documented as returning a pit pid_t result, not necessarily an int. This causes a build warning on Solaris 10 because of '%d' or '%u' are used in the format passed to snprintf(). Let's just cast the result as an int (respectively unsigned int). This can be backported to 2.0 and possibly older versions though it really has no impact. --- diff --git a/src/haproxy.c b/src/haproxy.c index c9b61c6a22..c3a448264f 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -3006,7 +3006,7 @@ int main(int argc, char **argv) /* if in master-worker mode, write the PID of the father */ if (global.mode & MODE_MWORKER) { char pidstr[100]; - snprintf(pidstr, sizeof(pidstr), "%d\n", getpid()); + snprintf(pidstr, sizeof(pidstr), "%d\n", (int)getpid()); if (pidfd >= 0) shut_your_big_mouth_gcc(write(pidfd, pidstr, strlen(pidstr))); } diff --git a/src/mworker.c b/src/mworker.c index 6a4f1f5755..511d9617dc 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -449,7 +449,7 @@ static int cli_io_handler_show_proc(struct appctx *appctx) chunk_printf(&trash, "#%-14s %-15s %-15s %-15s %-15s %-15s\n", "", "", "", "", "", ""); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); - chunk_appendf(&trash, "%-15u %-15s %-15u %-15d %-15s %-15s\n", getpid(), "master", 0, proc_self->reloads, uptime, haproxy_version); + chunk_appendf(&trash, "%-15u %-15s %-15u %-15d %-15s %-15s\n", (unsigned int)getpid(), "master", 0, proc_self->reloads, uptime, haproxy_version); free(uptime); uptime = NULL;