<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13287">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">openvpn: Remove useless conditional block in parse_state<br><br>tok != NULL is already checked in the for loop conditions.<br><br>Change-Id: I86e42e4537060b2ed8c860c0b71a225c5fe026c7<br>---<br>M src/osysmon_openvpn.c<br>1 file changed, 18 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/87/13287/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osysmon_openvpn.c b/src/osysmon_openvpn.c</span><br><span>index 3c03099..5d9af8a 100644</span><br><span>--- a/src/osysmon_openvpn.c</span><br><span>+++ b/src/osysmon_openvpn.c</span><br><span>@@ -98,25 +98,24 @@</span><br><span> }</span><br><span> </span><br><span> for (tok = strtok(tmp, ","), i = 0; tok && i < MAX_RESP_COMPONENTS; tok = strtok(NULL, ",")) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (tok) { /* Parse csv string and pick interesting tokens while ignoring the rest. */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* case 0: unix/date time, not needed */</span><br><span style="color: hsl(0, 100%, 40%);">- case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- update_name(vpn->rem_cfg, tok);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 2:</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buf, sizeof(buf), "%s (%s)", vpn->rem_cfg->name, tok);</span><br><span style="color: hsl(0, 100%, 40%);">- update_name(vpn->rem_cfg, buf);</span><br><span style="color: hsl(0, 100%, 40%);">- case 3:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_talloc_replace_string(vpn->rem_cfg, &vpn->tun_ip, tok);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 4:</span><br><span style="color: hsl(0, 100%, 40%);">- update_host(vpn->rem_cfg, tok);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 5:</span><br><span style="color: hsl(0, 100%, 40%);">- vpn->rem_cfg->remote_port = atoi(tok);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Parse csv string and pick interesting tokens while ignoring the rest. */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* case 0: unix/date time, not needed */</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ update_name(vpn->rem_cfg, tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "%s (%s)", vpn->rem_cfg->name, tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ update_name(vpn->rem_cfg, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ case 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(vpn->rem_cfg, &vpn->tun_ip, tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 4:</span><br><span style="color: hsl(120, 100%, 40%);">+ update_host(vpn->rem_cfg, tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 5:</span><br><span style="color: hsl(120, 100%, 40%);">+ vpn->rem_cfg->remote_port = atoi(tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> return NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13287">change 13287</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/13287"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I86e42e4537060b2ed8c860c0b71a225c5fe026c7 </div>
<div style="display:none"> Gerrit-Change-Number: 13287 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>