From daaea0c84fee46d9b63b746d5ed2cdf66f990352 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 3 Aug 2015 09:28:41 +0200 Subject: 64bit: Fix compiler warnings in regard to 64bit vty_interface_layer3.c:584:4: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=] sizeof(subscr->extension)-1, VTY_NEWLINE); --- openbsc/src/libmsc/vty_interface_layer3.c | 4 ++-- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 2 +- openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c | 4 ++-- openbsc/tests/bsc-nat/bsc_nat_test.c | 2 +- openbsc/tests/gbproxy/gbproxy_test.c | 2 +- openbsc/tests/gsm0408/gsm0408_test.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 1515aea0a..71fff936f 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -547,7 +547,7 @@ DEFUN(ena_subscr_name, if (strlen(name) > sizeof(subscr->name)-1) { vty_out(vty, - "%% NAME is too long, max. %d characters are allowed%s", + "%% NAME is too long, max. %zu characters are allowed%s", sizeof(subscr->name)-1, VTY_NEWLINE); return CMD_WARNING; } @@ -580,7 +580,7 @@ DEFUN(ena_subscr_extension, if (strlen(ext) > sizeof(subscr->extension)-1) { vty_out(vty, - "%% EXTENSION is too long, max. %d characters are allowed%s", + "%% EXTENSION is too long, max. %zu characters are allowed%s", sizeof(subscr->extension)-1, VTY_NEWLINE); return CMD_WARNING; } diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 5f703c290..1c03f27d4 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -156,7 +156,7 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) return -1; } else if (slen > sizeof(addr)) { fprintf(stderr, "Gateway received message from outerspace: %zu %zu\n", - slen, sizeof(addr)); + (size_t) slen, sizeof(addr)); return -1; } diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c b/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c index faceb59b5..9291c89e6 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c @@ -45,10 +45,10 @@ static void insert_rewrite_node(struct nat_rewrite_rule *rule, struct nat_rewrit { struct nat_rewrite_rule *new = &root->rule; - const size_t len = strlen(rule->prefix); + const int len = strlen(rule->prefix); int i; - if (len == 0) { + if (len <= 0) { LOGP(DNAT, LOGL_ERROR, "An empty prefix does not make sense.\n"); goto fail; } diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c index b830eb0df..a4b313c91 100644 --- a/openbsc/tests/bsc-nat/bsc_nat_test.c +++ b/openbsc/tests/bsc-nat/bsc_nat_test.c @@ -645,7 +645,7 @@ static void test_mgcp_rewrite(void) } if (msgb_l2len(output) != strlen(patc)) { - printf("Wrong sizes for test: %d %d != %d != %d\n", i, msgb_l2len(output), strlen(patc), strlen(orig)); + printf("Wrong sizes for test: %d %u != %zu != %zu\n", i, msgb_l2len(output), strlen(patc), strlen(orig)); printf("String '%s' vs '%s'\n", (const char *) output->l2h, patc); abort(); } diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c index 214d477c4..17f0a1795 100644 --- a/openbsc/tests/gbproxy/gbproxy_test.c +++ b/openbsc/tests/gbproxy/gbproxy_test.c @@ -956,7 +956,7 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg, int gprs_ns_callback(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, struct msgb *msg, uint16_t bvci) { - printf("CALLBACK, event %d, msg length %d, bvci 0x%04x\n%s\n\n", + printf("CALLBACK, event %d, msg length %zu, bvci 0x%04x\n%s\n\n", event, msgb_bssgp_len(msg), bvci, osmo_hexdump(msgb_l2(msg), msgb_l2len(msg))); diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c index 692ec90b0..781ef6147 100644 --- a/openbsc/tests/gsm0408/gsm0408_test.c +++ b/openbsc/tests/gsm0408/gsm0408_test.c @@ -48,7 +48,7 @@ #define VERIFY(res, cmp, wanted) \ if (!(res cmp wanted)) { \ printf("ASSERT failed: %s:%d Wanted: %d %s %d\n", \ - __FILE__, __LINE__, res, # cmp, wanted); \ + __FILE__, __LINE__, (int) res, # cmp, (int) wanted); \ } -- cgit v1.2.3