<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20500">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bssmap_le/bsslap tests: We must use %td for ptrdiff_t printing<br><br>Otherwise we get (valid!) format string warnings like these on 32bit<br>targets:<br><br>[ 372s] bssmap_le/bssmap_le_test.c: In function 'test_bssmap_le_enc_dec':<br>[ 372s] bssmap_le/bssmap_le_test.c:141:15: warning: format '%ld' expects argument of type 'long int', but argument 2 has type 'int' [-Wformat=]<br>[ 372s] printf("[%ld] %s: ERROR: failed to encode pdu\n", (pdu - bssmap_le_test_pdus),<br>[ 372s] ^<br><br>Closes: OS#4786<br>Change-Id: Ib1c16b8adc5c8c0a2b418db51d12089f9b49a844<br>---<br>M tests/bsslap/bsslap_test.c<br>M tests/bssmap_le/bssmap_le_test.c<br>2 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/20500/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/bsslap/bsslap_test.c b/tests/bsslap/bsslap_test.c</span><br><span>index 43ea0d4..f20f7db 100644</span><br><span>--- a/tests/bsslap/bsslap_test.c</span><br><span>+++ b/tests/bsslap/bsslap_test.c</span><br><span>@@ -61,12 +61,12 @@</span><br><span> void *loop_ctx = msg;</span><br><span> rc = osmo_bsslap_enc(msg, pdu);</span><br><span> if (rc <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: failed to encode pdu\n", (pdu - bsslap_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: failed to encode pdu\n", (pdu - bsslap_test_pdus),</span><br><span> osmo_bsslap_msgt_name(pdu->msg_type));</span><br><span> goto loop_end;</span><br><span> }</span><br><span> if (rc != msg->len) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: osmo_bsslap_enc() returned length %d but msgb has %d bytes\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: osmo_bsslap_enc() returned length %d but msgb has %d bytes\n",</span><br><span> (pdu - bsslap_test_pdus), osmo_bsslap_msgt_name(pdu->msg_type),</span><br><span> rc, msg->len);</span><br><span> goto loop_end;</span><br><span>@@ -75,21 +75,21 @@</span><br><span> memset(&dec_pdu, 0xff, sizeof(dec_pdu));</span><br><span> rc = osmo_bsslap_dec(&dec_pdu, &err, loop_ctx, msg->data, msg->len);</span><br><span> if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: failed to decode pdu: %s\n", (pdu - bsslap_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: failed to decode pdu: %s\n", (pdu - bsslap_test_pdus),</span><br><span> osmo_bsslap_msgt_name(pdu->msg_type), err->logmsg);</span><br><span> printf(" encoded data: %s\n", osmo_hexdump(msg->data, msg->len));</span><br><span> goto loop_end;</span><br><span> }</span><br><span> </span><br><span> if (memcmp(pdu, &dec_pdu, sizeof(dec_pdu))) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: decoded PDU != encoded PDU\n", (pdu - bsslap_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: decoded PDU != encoded PDU\n", (pdu - bsslap_test_pdus),</span><br><span> osmo_bsslap_msgt_name(pdu->msg_type));</span><br><span> printf(" original struct: %s\n", osmo_hexdump((void*)pdu, sizeof(*pdu)));</span><br><span> printf(" decoded struct: %s\n", osmo_hexdump((void*)&dec_pdu, sizeof(dec_pdu)));</span><br><span> goto loop_end;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ok\n", (pdu - bsslap_test_pdus), osmo_bsslap_msgt_name(pdu->msg_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ok\n", (pdu - bsslap_test_pdus), osmo_bsslap_msgt_name(pdu->msg_type));</span><br><span> </span><br><span> loop_end:</span><br><span> msgb_free(msg);</span><br><span>diff --git a/tests/bssmap_le/bssmap_le_test.c b/tests/bssmap_le/bssmap_le_test.c</span><br><span>index 59c7ed2..f9ebd92 100644</span><br><span>--- a/tests/bssmap_le/bssmap_le_test.c</span><br><span>+++ b/tests/bssmap_le/bssmap_le_test.c</span><br><span>@@ -138,7 +138,7 @@</span><br><span> </span><br><span> msg = osmo_bssap_le_enc(&enc_pdu);</span><br><span> if (!msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: failed to encode pdu\n", (pdu - bssmap_le_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: failed to encode pdu\n", (pdu - bssmap_le_test_pdus),</span><br><span> osmo_bssmap_le_msgt_name(pdu->msg_type));</span><br><span> goto loop_end;</span><br><span> }</span><br><span>@@ -147,14 +147,14 @@</span><br><span> memset(&dec_pdu, 0xff, sizeof(dec_pdu));</span><br><span> rc = osmo_bssap_le_dec(&dec_pdu, &err, loop_ctx, msg);</span><br><span> if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: failed to decode pdu: %s\n", (pdu - bssmap_le_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: failed to decode pdu: %s\n", (pdu - bssmap_le_test_pdus),</span><br><span> osmo_bssmap_le_msgt_name(pdu->msg_type), err->logmsg);</span><br><span> printf(" encoded data: %s\n", osmo_hexdump(msg->data, msg->len));</span><br><span> goto loop_end;</span><br><span> }</span><br><span> </span><br><span> if (memcmp(&enc_pdu, &dec_pdu, sizeof(dec_pdu))) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ERROR: decoded PDU != encoded PDU\n", (pdu - bssmap_le_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ERROR: decoded PDU != encoded PDU\n", (pdu - bssmap_le_test_pdus),</span><br><span> osmo_bssmap_le_msgt_name(pdu->msg_type));</span><br><span> printf(" original struct: %s\n", osmo_hexdump((void*)&enc_pdu, sizeof(enc_pdu)));</span><br><span> printf(" decoded struct: %s\n", osmo_hexdump((void*)&dec_pdu, sizeof(dec_pdu)));</span><br><span>@@ -162,7 +162,7 @@</span><br><span> goto loop_end;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("[%ld] %s: ok (encoded len = %d)\n", (pdu - bssmap_le_test_pdus),</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%td] %s: ok (encoded len = %d)\n", (pdu - bssmap_le_test_pdus),</span><br><span> osmo_bssmap_le_msgt_name(pdu->msg_type), msg->len);</span><br><span> </span><br><span> loop_end:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20500">change 20500</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/20500"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib1c16b8adc5c8c0a2b418db51d12089f9b49a844 </div>
<div style="display:none"> Gerrit-Change-Number: 20500 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>