diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-08-15 13:24:52 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-08-15 13:36:11 +0200 |
| commit | f3afabe989df0d75f670c1d1b15e684674d9137a (patch) | |
| tree | ab2d9f27f56c6b2e24d41e39eb27b71fef66273c | |
| parent | baaa66c445486a44be091209a9a96719f9ea8470 (diff) | |
misc: Attempt to fix various 64bit compiler warnings
Change-Id: I4ed058aba15d9fdc22dde99d60df0aabd6585b75
| -rw-r--r-- | src/link_udp.c | 2 | ||||
| -rw-r--r-- | src/mgcp_ss7.c | 4 | ||||
| -rw-r--r-- | src/msc_conn.c | 2 | ||||
| -rw-r--r-- | src/sctp_m3ua_client.c | 2 | ||||
| -rw-r--r-- | tests/patching/patching_test.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/link_udp.c b/src/link_udp.c index 85f6c09..d66c1cd 100644 --- a/src/link_udp.c +++ b/src/link_udp.c @@ -149,7 +149,7 @@ static int udp_read_cb(struct osmo_fd *fd) length = ntohl(hdr->data_length); if (length + sizeof(*hdr) > (unsigned int) rc) { LOGP(DINP, LOGL_ERROR, - "The MSU payload does not fit: %u + %u > %d on link %d/%s of %d/%s.\n", + "The MSU payload does not fit: %u + %zu > %d on link %d/%s of %d/%s.\n", length, sizeof(*hdr), rc, link->nr, link->name, link->set->nr, link->set->name); rc = 0; diff --git a/src/mgcp_ss7.c b/src/mgcp_ss7.c index 6604545..317832c 100644 --- a/src/mgcp_ss7.c +++ b/src/mgcp_ss7.c @@ -733,8 +733,8 @@ static int read_call_agent(struct osmo_fd *fd) perror("Gateway failed to read"); return -1; } else if (slen > sizeof(addr)) { - fprintf(stderr, "Gateway received message from outerspace: %d %d\n", - slen, sizeof(addr)); + fprintf(stderr, "Gateway received message from outerspace: %u %zu\n", + (unsigned int) slen, sizeof(addr)); return -1; } diff --git a/src/msc_conn.c b/src/msc_conn.c index 82ca811..703c761 100644 --- a/src/msc_conn.c +++ b/src/msc_conn.c @@ -605,7 +605,7 @@ static void msc_handle_id_response(struct msc_connection *msc, struct msgb *msg) len = msgb_l2len(msg) - 4; if (len != strlen(msc->token)) { - LOGP(DMSC, LOGL_ERROR, "Wrong length %u vs. %u\n", + LOGP(DMSC, LOGL_ERROR, "Wrong length %u vs. %zu\n", len, strlen(msc->token)); goto clean; } diff --git a/src/sctp_m3ua_client.c b/src/sctp_m3ua_client.c index 01f2af7..3726dab 100644 --- a/src/sctp_m3ua_client.c +++ b/src/sctp_m3ua_client.c @@ -569,7 +569,7 @@ static void m3ua_handle_trans(struct mtp_m3ua_client_link *link, struct xua_msg dpc = ntohl(proto->dpc); sls = proto->sls; si = proto->si; - LOGP(DINP, LOGL_DEBUG, "Got data for OPC(%d)/DPC(%d)/SLS(%d) len(%d)\n", + LOGP(DINP, LOGL_DEBUG, "Got data for OPC(%d)/DPC(%d)/SLS(%d) len(%zu)\n", opc, dpc, sls, msgb_l2len(msg) - sizeof(*proto)); diff --git a/tests/patching/patching_test.c b/tests/patching/patching_test.c index 9208788..26d4a52 100644 --- a/tests/patching/patching_test.c +++ b/tests/patching/patching_test.c @@ -368,7 +368,7 @@ static void test_rewrite_msc_fixed_ass_cmpl(void) } if (msgb_l2len(outp) != sizeof(dt1_ass_compl_hardcoded)) { - printf("The length's don't match on %u != %u\n", + printf("The length's don't match on %u != %zu\n", msgb_l2len(outp), sizeof(dt1_ass_compl_hardcoded)); printf("hex: %s\n", osmo_hexdump(outp->l2h, msgb_l2len(outp))); abort(); |