<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10670">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stdio: add void 'l' format string qualifier<br><br>Wformat requires uint32_t to be used in format string with the 'l'<br>qualifier (l = long = at least 32 bits).<br>this qualifier was not handled before.<br>since on ARM 32-bit int == long we can simply ignore it (stdio<br>already does not support 64-bit data).<br><br>Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7<br>---<br>M firmware/libcommon/source/stdio.c<br>1 file changed, 16 insertions(+), 13 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/10670/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c</span><br><span>index 04d73f0..2bfaed7 100644</span><br><span>--- a/firmware/libcommon/source/stdio.c</span><br><span>+++ b/firmware/libcommon/source/stdio.c</span><br><span>@@ -350,19 +350,22 @@</span><br><span> }</span><br><span> </span><br><span> // Parse type</span><br><span style="color: hsl(0, 100%, 40%);">- switch (*pFormat) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'd': </span><br><span style="color: hsl(0, 100%, 40%);">- case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 's': num = PutString(pStr, va_arg(ap, char *)); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return EOF;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- pFormat++;</span><br><span style="color: hsl(120, 100%, 40%);">+ do {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (*pFormat) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'l': num = -1; break; // ignore long qualifier since int == long (and long long is not supported)</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'd':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 's': num = PutString(pStr, va_arg(ap, char *)); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return EOF;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ pFormat++;</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (num < 0);</span><br><span> pStr += num;</span><br><span> size += num;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10670">change 10670</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/10670"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7 </div>
<div style="display:none"> Gerrit-Change-Number: 10670 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>