<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17623">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_rlcmac.cpp: Avoid declaring variable in for loop<br><br>That's only allowed under C++.<br><br>Change-Id: I0da8849a0fb7f9a7ee5e726edea87e91dc411ea8<br>---<br>M src/gsm_rlcmac.cpp<br>1 file changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/23/17623/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index 0d769ce..3525bf0 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -5611,6 +5611,7 @@</span><br><span> </span><br><span> void decode_gsm_rlcmac_uplink_data(struct bitvec *vector, RlcMacUplinkDataBlock_t * data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+  unsigned i;</span><br><span>   unsigned readIndex = 0;</span><br><span>   //unsigned dataLen = 0;</span><br><span>   guint8 payload_type = bitvec_read_field(vector, &readIndex, 2);</span><br><span>@@ -5646,7 +5647,7 @@</span><br><span>     if(data->E_1 == 0) // Extension octet follows immediately</span><br><span>     {</span><br><span>       // Octet 3 (optional)</span><br><span style="color: hsl(0, 100%, 40%);">-      unsigned i = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+      i = 0;</span><br><span>       do</span><br><span>       {</span><br><span>  data->LENGTH_INDICATOR[i] = bitvec_read_field(vector, &readIndex, 6);</span><br><span>@@ -5673,7 +5674,7 @@</span><br><span>     unsigned dataLen = 23 - readIndex/8;</span><br><span>     LOGPC(DRLCMACDATA, LOGL_NOTICE, "DATA[%u] = ", dataLen);</span><br><span>     assert(dataLen <= 20);</span><br><span style="color: hsl(0, 100%, 40%);">-    for (unsigned i = 0; i < dataLen; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+    for (i = 0; i < dataLen; i++)</span><br><span>     {</span><br><span>       data->RLC_DATA[i] = bitvec_read_field(vector, &readIndex, 8);</span><br><span>       LOGPC(DRLCMACDATA, LOGL_NOTICE, "%02x", (unsigned)(data->RLC_DATA[i]));</span><br><span>@@ -5689,6 +5690,7 @@</span><br><span> </span><br><span> void encode_gsm_rlcmac_downlink_data(struct bitvec *vector, RlcMacDownlinkDataBlock_t * data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+  unsigned i;</span><br><span>   unsigned writeIndex = 0;</span><br><span> </span><br><span>   if (data->PAYLOAD_TYPE == PAYLOAD_TYPE_DATA)</span><br><span>@@ -5720,7 +5722,7 @@</span><br><span>     // Octet 3 (optional)</span><br><span>     if(data->E_1 == 0)</span><br><span>     {</span><br><span style="color: hsl(0, 100%, 40%);">-      unsigned i = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+      i = 0;</span><br><span>       do</span><br><span>       {</span><br><span>     bitvec_write_field(vector, &writeIndex, data->LENGTH_INDICATOR[i], 6);</span><br><span>@@ -5736,7 +5738,7 @@</span><br><span>     unsigned dataNumOctets = 23 - writeIndex/8;</span><br><span>     LOGPC(DRLCMACDATA, LOGL_NOTICE, "DATA[%u] = ", dataNumOctets);</span><br><span>     assert(dataNumOctets <= 20);</span><br><span style="color: hsl(0, 100%, 40%);">-    for (unsigned i = 0; i < dataNumOctets; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+    for (i = 0; i < dataNumOctets; i++)</span><br><span>     {</span><br><span>       bitvec_write_field(vector, &writeIndex, data->RLC_DATA[i], 8);</span><br><span>       LOGPC(DRLCMACDATA, LOGL_NOTICE, "%02x", (unsigned)(data->RLC_DATA[i]));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17623">change 17623</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/osmo-pcu/+/17623"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0da8849a0fb7f9a7ee5e726edea87e91dc411ea8 </div>
<div style="display:none"> Gerrit-Change-Number: 17623 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>