<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11698">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">re-order condition checks for clarity<br><br>Coverity points out that conditional checks in set_net_timezone()<br>depend on each other: The value of 'override' depends on 'hourstr'<br>being non-NULL. Nest these conditional checks such that this<br>dependency becomes obvious.<br><br>No functional change.<br><br>Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026<br>Related: CID#148208<br>---<br>M src/osmo-bsc/osmo_bsc_ctrl.c<br>1 file changed, 9 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/11698/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>index a4a9a36..80699f8 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>@@ -512,8 +512,9 @@</span><br><span> static int set_net_timezone(struct ctrl_cmd *cmd, void *data)</span><br><span> {</span><br><span>        char *saveptr, *hourstr, *minstr, *dststr, *tmp = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-    int override;</span><br><span style="color: hsl(120, 100%, 40%);">+ int override = 0;</span><br><span>    struct gsm_network *net = (struct gsm_network*)cmd->node;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gsm_tz *tz = &net->tz;</span><br><span> </span><br><span>     tmp = talloc_strdup(cmd, cmd->value);</span><br><span>     if (!tmp)</span><br><span>@@ -523,19 +524,17 @@</span><br><span>    minstr = strtok_r(NULL, ",", &saveptr);</span><br><span>        dststr = strtok_r(NULL, ",", &saveptr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       override = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   if (hourstr != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+  if (hourstr != NULL) {</span><br><span>               override = strcasecmp(hourstr, "off") != 0;</span><br><span style="color: hsl(120, 100%, 40%);">+         if (override) {</span><br><span style="color: hsl(120, 100%, 40%);">+                       tz->hr  = atol(hourstr);</span><br><span style="color: hsl(120, 100%, 40%);">+                   tz->mn  = minstr ? atol(minstr) : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                       tz->dst = dststr ? atol(dststr) : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   struct gsm_tz *tz = &net->tz;</span><br><span>         tz->override = override;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (override) {</span><br><span style="color: hsl(0, 100%, 40%);">-         tz->hr  = hourstr ? atol(hourstr) : 0;</span><br><span style="color: hsl(0, 100%, 40%);">-               tz->mn  = minstr ? atol(minstr) : 0;</span><br><span style="color: hsl(0, 100%, 40%);">-         tz->dst = dststr ? atol(dststr) : 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span>        talloc_free(tmp);</span><br><span>    tmp = NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11698">change 11698</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/11698"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026 </div>
<div style="display:none"> Gerrit-Change-Number: 11698 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>