From 59722031744e76c5619ed5b46b8aae76b01b32ac Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 13 Oct 2023 15:50:29 +1100 Subject: log: Enable format warnings logmsg() takes printf like arguments, but because it's not a built in, the compiler won't generate warnings if the format string and parameters don't match. Enable those by using the format attribute. Strictly speaking this is a gcc extension, but I believe it is also supported by some other common compilers. We already use some other attributes in various places. For now, just use it and we can worry about compilers that don't support it if it comes up. This exposes some warnings from existing callers, both in gcc and in clang-tidy: - Some are straight out bugs, which we correct - It's occasionally useful to invoke the logging functions with an empty string, which gcc objects to, so disable that specific warning in the Makefile - Strictly speaking the C standard requires that the parameter for a %p be a (void *), not some other pointer type. That's only likely to cause problems in practice on weird architectures with different sized representations for pointers to different types. Nonetheless add the casts to make it happy. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tcp.c') diff --git a/tcp.c b/tcp.c index a1ff66d..19d16a6 100644 --- a/tcp.c +++ b/tcp.c @@ -1212,7 +1212,8 @@ static void tcp_hash_insert(const struct ctx *c, struct tcp_tap_conn *conn) tc_hash[b] = conn; debug("TCP: hash table insert: index %li, sock %i, bucket: %i, next: " - "%p", CONN_IDX(conn), conn->sock, b, conn_at_idx(conn->next_index)); + "%p", CONN_IDX(conn), conn->sock, b, + (void *)conn_at_idx(conn->next_index)); } /** @@ -1239,7 +1240,7 @@ static void tcp_hash_remove(const struct ctx *c, debug("TCP: hash table remove: index %li, sock %i, bucket: %i, new: %p", CONN_IDX(conn), conn->sock, b, - prev ? conn_at_idx(prev->next_index) : tc_hash[b]); + (void *)(prev ? conn_at_idx(prev->next_index) : tc_hash[b])); } /** @@ -1267,7 +1268,8 @@ static void tcp_tap_conn_update(const struct ctx *c, struct tcp_tap_conn *old, debug("TCP: hash table update: old index %li, new index %li, sock %i, " "bucket: %i, old: %p, new: %p", - CONN_IDX(old), CONN_IDX(new), new->sock, b, old, new); + CONN_IDX(old), CONN_IDX(new), new->sock, b, + (void *)old, (void *)new); tcp_epoll_ctl(c, new); } @@ -1311,7 +1313,7 @@ void tcp_table_compact(struct ctx *c, union tcp_conn *hole) if (CONN_IDX(hole) == --c->tcp.conn_count) { debug("TCP: table compaction: maximum index was %li (%p)", - CONN_IDX(hole), hole); + CONN_IDX(hole), (void *)hole); memset(hole, 0, sizeof(*hole)); return; } @@ -1326,7 +1328,8 @@ void tcp_table_compact(struct ctx *c, union tcp_conn *hole) debug("TCP: table compaction (spliced=%d): old index %li, new index %li, " "from: %p, to: %p", - from->c.spliced, CONN_IDX(from), CONN_IDX(hole), from, hole); + from->c.spliced, CONN_IDX(from), CONN_IDX(hole), + (void *)from, (void *)hole); memset(from, 0, sizeof(*from)); } -- cgit v1.2.3