<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/14430">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: command.c: Get rid of big indentation block<br><br>This block will become bigger in forthcoming commits.<br><br>Change-Id: Ibc1494014b1e77ce10950f7268a44d2d2091a6f2<br>---<br>M src/vty/command.c<br>1 file changed, 26 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/14430/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 4189c7c..54dbfe1 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -2294,23 +2294,24 @@</span><br><span>    argc = 0;</span><br><span> </span><br><span>        for (i = 0; i < vector_active(vline); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-         if (varflag)</span><br><span style="color: hsl(120, 100%, 40%);">+          if (varflag) {</span><br><span>                       argv[argc++] = vector_slot(vline, i);</span><br><span style="color: hsl(0, 100%, 40%);">-           else {</span><br><span style="color: hsl(0, 100%, 40%);">-                  vector descvec =</span><br><span style="color: hsl(0, 100%, 40%);">-                            vector_slot(matched_element->strvec, i);</span><br><span style="color: hsl(120, 100%, 40%);">+                       continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                   if (vector_active(descvec) == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-                              struct desc *desc = vector_slot(descvec, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+          vector descvec = vector_slot(matched_element->strvec, i);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                                if (CMD_VARARG(desc->cmd))</span><br><span style="color: hsl(0, 100%, 40%);">-                                   varflag = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+          if (vector_active(descvec) == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    struct desc *desc = vector_slot(descvec, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                                if (varflag || CMD_VARIABLE(desc->cmd)</span><br><span style="color: hsl(0, 100%, 40%);">-                                   || CMD_OPTION(desc->cmd))</span><br><span style="color: hsl(0, 100%, 40%);">-                                        argv[argc++] = vector_slot(vline, i);</span><br><span style="color: hsl(0, 100%, 40%);">-                   } else</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (CMD_VARARG(desc->cmd))</span><br><span style="color: hsl(120, 100%, 40%);">+                         varflag = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (varflag || CMD_VARIABLE(desc->cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+                         || CMD_OPTION(desc->cmd))</span><br><span>                             argv[argc++] = vector_slot(vline, i);</span><br><span style="color: hsl(120, 100%, 40%);">+         } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      argv[argc++] = vector_slot(vline, i);</span><br><span>                }</span><br><span> </span><br><span>                if (argc >= CMD_ARGC_MAX)</span><br><span>@@ -2439,23 +2440,24 @@</span><br><span>       argc = 0;</span><br><span> </span><br><span>        for (i = 0; i < vector_active(vline); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-         if (varflag)</span><br><span style="color: hsl(120, 100%, 40%);">+          if (varflag) {</span><br><span>                       argv[argc++] = vector_slot(vline, i);</span><br><span style="color: hsl(0, 100%, 40%);">-           else {</span><br><span style="color: hsl(0, 100%, 40%);">-                  vector descvec =</span><br><span style="color: hsl(0, 100%, 40%);">-                            vector_slot(matched_element->strvec, i);</span><br><span style="color: hsl(120, 100%, 40%);">+                       continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                   if (vector_active(descvec) == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-                              struct desc *desc = vector_slot(descvec, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+          vector descvec =vector_slot(matched_element->strvec, i);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                         if (CMD_VARARG(desc->cmd))</span><br><span style="color: hsl(0, 100%, 40%);">-                                   varflag = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+          if (vector_active(descvec) == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    struct desc *desc = vector_slot(descvec, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                                if (varflag || CMD_VARIABLE(desc->cmd)</span><br><span style="color: hsl(0, 100%, 40%);">-                                   || CMD_OPTION(desc->cmd))</span><br><span style="color: hsl(0, 100%, 40%);">-                                        argv[argc++] = vector_slot(vline, i);</span><br><span style="color: hsl(0, 100%, 40%);">-                   } else</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (CMD_VARARG(desc->cmd))</span><br><span style="color: hsl(120, 100%, 40%);">+                         varflag = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (varflag || CMD_VARIABLE(desc->cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+                         || CMD_OPTION(desc->cmd))</span><br><span>                             argv[argc++] = vector_slot(vline, i);</span><br><span style="color: hsl(120, 100%, 40%);">+         } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      argv[argc++] = vector_slot(vline, i);</span><br><span>                }</span><br><span> </span><br><span>                if (argc >= CMD_ARGC_MAX)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/14430">change 14430</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/+/14430"/><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: Ibc1494014b1e77ce10950f7268a44d2d2091a6f2 </div>
<div style="display:none"> Gerrit-Change-Number: 14430 </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>