From 936c9844b0ff4aab06301f18fe31e08b1818d0a2 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 13 Dec 2007 12:09:45 +0100 Subject: [PATCH] [LIBNL]: Fix format strings Use %td for ptrdiff_t and %zu for size_t. Signed-off-by: Patrick McHardy --- lib/attr.c | 4 ++-- lib/msg.c | 6 +++--- src/nl-list-caches.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/attr.c b/lib/attr.c index fbce4ac..aa77ca5 100644 --- a/lib/attr.c +++ b/lib/attr.c @@ -494,7 +494,7 @@ struct nlattr *nla_reserve(struct nl_msg *n, int attrtype, int attrlen) memset((unsigned char *) nla + nla->nla_len, 0, nla_padlen(attrlen)); n->nm_nlh->nlmsg_len = tlen; - NL_DBG(2, "msg %p: Reserved %d bytes at offset +%d for attr %d " + NL_DBG(2, "msg %p: Reserved %d bytes at offset +%td for attr %d " "nlmsg_len=%d\n", n, attrlen, (void *) nla - nlmsg_data(n->nm_nlh), attrtype, n->nm_nlh->nlmsg_len); @@ -521,7 +521,7 @@ int nla_put(struct nl_msg *n, int attrtype, int attrlen, const void *data) return nl_errno(ENOMEM); memcpy(nla_data(nla), data, attrlen); - NL_DBG(2, "msg %p: Wrote %d bytes at offset +%d for attr %d\n", + NL_DBG(2, "msg %p: Wrote %d bytes at offset +%td for attr %d\n", n, attrlen, (void *) nla - nlmsg_data(n->nm_nlh), attrtype); return 0; diff --git a/lib/msg.c b/lib/msg.c index d19ac08..cacc773 100644 --- a/lib/msg.c +++ b/lib/msg.c @@ -363,7 +363,7 @@ static struct nl_msg *__nlmsg_alloc(size_t len) nm->nm_protocol = -1; nm->nm_nlh->nlmsg_len = len; - NL_DBG(2, "msg %p: Allocated new message, nlmsg_len=%d\n", nm, len); + NL_DBG(2, "msg %p: Allocated new message, nlmsg_len=%zu\n", nm, len); return nm; errout: @@ -494,7 +494,7 @@ void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad) if (tlen > len) memset(tmp + len, 0, tlen - len); - NL_DBG(2, "msg %p: Reserved %d bytes, pad=%d, nlmsg_len=%d\n", + NL_DBG(2, "msg %p: Reserved %zu bytes, pad=%d, nlmsg_len=%d\n", n, len, pad, n->nm_nlh->nlmsg_len); return tmp; @@ -524,7 +524,7 @@ int nlmsg_append(struct nl_msg *n, void *data, size_t len, int pad) return nl_errno(ENOMEM); memcpy(tmp, data, len); - NL_DBG(2, "msg %p: Appended %d bytes with padding %d\n", n, len, pad); + NL_DBG(2, "msg %p: Appended %zu bytes with padding %d\n", n, len, pad); return 0; } diff --git a/src/nl-list-caches.c b/src/nl-list-caches.c index 42a2546..ed0e92a 100644 --- a/src/nl-list-caches.c +++ b/src/nl-list-caches.c @@ -55,7 +55,7 @@ static void print(struct nl_cache_ops *ops, void *arg) printf(" cacheable object:\n" \ " name: %s:\n" \ - " size: %d bytes\n" \ + " size: %zu bytes\n" \ " constructor: %s\n" \ " free-data: %s\n" \ " clone: %s\n" \