<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16570">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix format string related warnings (int vs. long)<br><br>Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802<br>---<br>M firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c<br>M firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c<br>M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c<br>M firmware/libcommon/source/host_communication.c<br>M firmware/libcommon/source/simtrace_iso7816.c<br>5 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/70/16570/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c</span><br><span>index 0c288e0..f8925b4 100644</span><br><span>--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c</span><br><span>+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c</span><br><span>@@ -163,7 +163,7 @@</span><br><span> wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;</span><br><span> wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;</span><br><span> /* Store values */</span><br><span> if ( pEfc )</span><br><span> {</span><br><span>diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c</span><br><span>index 677ea30..c661b3f 100644</span><br><span>--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c</span><br><span>+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c</span><br><span>@@ -134,7 +134,7 @@</span><br><span> // Store actual page numbers</span><br><span> EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ;</span><br><span> EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ;</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG( "Actual lock range is 0x%06X - 0x%06X\n\r", *pdwActualStart, *pdwActualEnd ) ;</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ;</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c</span><br><span>index 4f772be..4467cc9 100644</span><br><span>--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c</span><br><span>+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c</span><br><span>@@ -68,7 +68,7 @@</span><br><span> {</span><br><span> uint8_t u8 = g_dfu->state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);</span><br><span> </span><br><span> USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);</span><br><span> }</span><br><span>diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c</span><br><span>index ea573bb..c305b80 100644</span><br><span>--- a/firmware/libcommon/source/host_communication.c</span><br><span>+++ b/firmware/libcommon/source/host_communication.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> local_irq_save(x);</span><br><span> bep->in_progress--;</span><br><span> local_irq_restore(x);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%u: in_progress=%d\n", bep->ep, bep->in_progress);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress);</span><br><span> </span><br><span> if (status != USBD_STATUS_SUCCESS)</span><br><span> TRACE_ERROR("%s error, status=%d\n", __func__, status);</span><br><span>@@ -79,7 +79,7 @@</span><br><span> </span><br><span> local_irq_restore(x);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%s (EP=0x%02x), in_progress=%d\r\n", __func__, ep, bep->in_progress);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%s (EP=0x%02x), in_progress=%lu\r\n", __func__, ep, bep->in_progress);</span><br><span> </span><br><span> msg->dst = bep;</span><br><span> </span><br><span>@@ -92,7 +92,7 @@</span><br><span> local_irq_save(x);</span><br><span> bep->in_progress--;</span><br><span> local_irq_restore(x);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%02x: in_progress=%d\n", bep->ep, bep->in_progress);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -106,7 +106,7 @@</span><br><span> struct msgb *msg = (struct msgb *) arg;</span><br><span> struct usb_buffered_ep *bep = msg->dst;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%s (EP=%u, len=%u, q=%p)\r\n", __func__,</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%s (EP=%u, len=%lu, q=%p)\r\n", __func__,</span><br><span> bep->ep, transferred, &bep->queue);</span><br><span> </span><br><span> bep->in_progress = 0;</span><br><span>diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>index 8ee3f8c..dc41c08 100644</span><br><span>--- a/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>+++ b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>@@ -109,7 +109,7 @@</span><br><span> /* Fill char into buffer */</span><br><span> rbuf_write(&sim_rcv_buf, c);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("e %x st: %x\n", c, stat);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("e %x st: %lx\n", c, stat);</span><br><span> } /* else: error occurred */</span><br><span> </span><br><span> char_stat = stat;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16570">change 16570</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/simtrace2/+/16570"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802 </div>
<div style="display:none"> Gerrit-Change-Number: 16570 </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>