<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/14422">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: command.c: Fix is_cmd_ambiguous() returning always 0<br><br>inner block defined variable "enum match_type ret" was being masking<br>outter block variable "int ret = 0". The ret variable was being given<br>non zero values only inside the inner block, so that change was done on<br>the inner variable and not the outer one, which is returned.<br><br>Change-Id: Iec87d7db49a096d07e38ff8a060b923a52bfd6ba<br>---<br>M src/vty/command.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/14422/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/command.c b/src/vty/command.c</span><br><span>index 6380487..e9690bb 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -1521,7 +1521,7 @@</span><br><span> if (!desc)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- enum match_type ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum match_type mtype;</span><br><span> const char *str = desc->cmd;</span><br><span> </span><br><span> if (CMD_OPTION(str)) {</span><br><span>@@ -1573,10 +1573,10 @@</span><br><span> match++;</span><br><span> break;</span><br><span> case ipv6_prefix_match:</span><br><span style="color: hsl(0, 100%, 40%);">- if ((ret =</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((mtype =</span><br><span> cmd_ipv6_prefix_match</span><br><span> (command)) != no_match) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret == partly_match) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mtype == partly_match) {</span><br><span> ret = 2; /* There is incomplete match. */</span><br><span> goto free_and_return;</span><br><span> }</span><br><span>@@ -1590,10 +1590,10 @@</span><br><span> match++;</span><br><span> break;</span><br><span> case ipv4_prefix_match:</span><br><span style="color: hsl(0, 100%, 40%);">- if ((ret =</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((mtype =</span><br><span> cmd_ipv4_prefix_match</span><br><span> (command)) != no_match) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret == partly_match) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mtype == partly_match) {</span><br><span> ret = 2; /* There is incomplete match. */</span><br><span> goto free_and_return;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/14422">change 14422</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/libosmocore/+/14422"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iec87d7db49a096d07e38ff8a060b923a52bfd6ba </div>
<div style="display:none"> Gerrit-Change-Number: 14422 </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>