From: Willy Tarreau <w@1wt.eu>
Date: Tue, 12 Apr 2022 06:28:18 +0000 (+0200)
Subject: BUILD: peers: adjust some printf format to silence cppcheck
X-Git-Tag: v2.6-dev6~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2645b34341495bef56a59664a83de886bef53d81;p=thirdparty%2Fhaproxy.git

BUILD: peers: adjust some printf format to silence cppcheck

In issue #1184, cppcheck complains about some inconsistent printf
formats. At least the one in peer_prepare_hellomsg() that uses "%u"
for the int "min_ver" is wrong. Let's force other types to make it
happy, though constants cannot cause trouble.
---

diff --git a/src/peers.c b/src/peers.c
index 5172214f85..413f594a25 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -583,8 +583,8 @@ static int peer_prepare_hellomsg(char *msg, size_t size, struct peer_prep_params
 	peer = p->hello.peer;
 	min_ver = (peer->flags & PEER_F_DWNGRD) ? PEER_DWNGRD_MINOR_VER : PEER_MINOR_VER;
 	/* Prepare headers */
-	ret = snprintf(msg, size, PEER_SESSION_PROTO_NAME " %u.%u\n%s\n%s %d %d\n",
-	              PEER_MAJOR_VER, min_ver, peer->id, localpeer, (int)getpid(), 1);
+	ret = snprintf(msg, size, PEER_SESSION_PROTO_NAME " %d.%d\n%s\n%s %d %d\n",
+		       (int)PEER_MAJOR_VER, min_ver, peer->id, localpeer, (int)getpid(), (int)1);
 	if (ret >= size)
 		return 0;
 
@@ -600,7 +600,7 @@ static int peer_prepare_status_successmsg(char *msg, size_t size, struct peer_pr
 {
 	int ret;
 
-	ret = snprintf(msg, size, "%d\n", PEER_SESS_SC_SUCCESSCODE);
+	ret = snprintf(msg, size, "%d\n", (int)PEER_SESS_SC_SUCCESSCODE);
 	if (ret >= size)
 		return 0;