<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18860">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: _sched_dequeue_prim(): Refactor goto paths<br><br>Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9<br>---<br>M src/common/scheduler.c<br>1 file changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/18860/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 86978eb..ed7d412 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -643,13 +643,8 @@</span><br><span>  llist_for_each_entry_safe(msg, msg2, &l1ts->dl_prims, list) {</span><br><span>                 l1sap = msgb_l1sap_prim(msg);</span><br><span>                if (l1sap->oph.operation != PRIM_OP_REQUEST) {</span><br><span style="color: hsl(0, 100%, 40%);">-wrong_type:</span><br><span>                         LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-free_msg:</span><br><span style="color: hsl(0, 100%, 40%);">-                       /* unlink and free message */</span><br><span style="color: hsl(0, 100%, 40%);">-                   llist_del(&msg->list);</span><br><span style="color: hsl(0, 100%, 40%);">-                   msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-                 return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+                  goto free_msg;</span><br><span>               }</span><br><span>            switch (l1sap->oph.primitive) {</span><br><span>           case PRIM_PH_DATA:</span><br><span>@@ -663,7 +658,8 @@</span><br><span>                     l1sap_fn = l1sap->u.tch.fn;</span><br><span>                       break;</span><br><span>               default:</span><br><span style="color: hsl(0, 100%, 40%);">-                        goto wrong_type;</span><br><span style="color: hsl(120, 100%, 40%);">+                      LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                      goto free_msg;</span><br><span>               }</span><br><span>            prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME);</span><br><span>               if (prim_fn > 100) { /* l1sap_fn < fn */</span><br><span>@@ -700,6 +696,12 @@</span><br><span>        /* unlink and return message */</span><br><span>      llist_del(&msg->list);</span><br><span>        return msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+free_msg:</span><br><span style="color: hsl(120, 100%, 40%);">+      /* unlink and free message */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&msg->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+       return NULL;</span><br><span> }</span><br><span> </span><br><span> int _sched_compose_ph_data_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18860">change 18860</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-bts/+/18860"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 </div>
<div style="display:none"> Gerrit-Change-Number: 18860 </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>