<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20236">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: cosmetic: s/width/cmd_width/g in vty_describe_command()<br><br>Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5<br>---<br>M src/vty/vty.c<br>1 file changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/20236/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/vty.c b/src/vty/vty.c</span><br><span>index e335f3a..2b131a4 100644</span><br><span>--- a/src/vty/vty.c</span><br><span>+++ b/src/vty/vty.c</span><br><span>@@ -1119,7 +1119,7 @@</span><br><span> int ret;</span><br><span> vector vline;</span><br><span> vector describe;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int i, width, desc_width;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i, cmd_width, desc_width;</span><br><span> struct desc *desc, *desc_cr = NULL;</span><br><span> </span><br><span> vline = cmd_make_strvec(vty->buf);</span><br><span>@@ -1152,7 +1152,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Get width of command string. */</span><br><span style="color: hsl(0, 100%, 40%);">- width = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_width = 0;</span><br><span> for (i = 0; i < vector_active(describe); i++)</span><br><span> if ((desc = vector_slot(describe, i)) != NULL) {</span><br><span> unsigned int len;</span><br><span>@@ -1164,12 +1164,12 @@</span><br><span> if (desc->cmd[0] == '.')</span><br><span> len--;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (width < len)</span><br><span style="color: hsl(0, 100%, 40%);">- width = len;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmd_width < len)</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_width = len;</span><br><span> }</span><br><span> </span><br><span> /* Get width of description string. */</span><br><span style="color: hsl(0, 100%, 40%);">- desc_width = vty->width - (width + 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ desc_width = vty->width - (cmd_width + 6);</span><br><span> </span><br><span> /* Print out description. */</span><br><span> for (i = 0; i < vector_active(describe); i++)</span><br><span>@@ -1188,15 +1188,15 @@</span><br><span> '.' ? desc->cmd + 1 : desc->cmd,</span><br><span> VTY_NEWLINE);</span><br><span> else if (desc_width >= strlen(desc->str))</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %-*s %s%s", width,</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %-*s %s%s", cmd_width,</span><br><span> desc->cmd[0] ==</span><br><span> '.' ? desc->cmd + 1 : desc->cmd,</span><br><span> desc->str, VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_describe_fold(vty, width, desc_width, desc);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_describe_fold(vty, cmd_width, desc_width, desc);</span><br><span> </span><br><span> #if 0</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %-*s %s%s", width</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %-*s %s%s", cmd_width</span><br><span> desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd,</span><br><span> desc->str ? desc->str : "", VTY_NEWLINE);</span><br><span> #endif /* 0 */</span><br><span>@@ -1208,11 +1208,11 @@</span><br><span> desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd,</span><br><span> VTY_NEWLINE);</span><br><span> else if (desc_width >= strlen(desc->str))</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %-*s %s%s", width,</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %-*s %s%s", cmd_width,</span><br><span> desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd,</span><br><span> desc->str, VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_describe_fold(vty, width, desc_width, desc);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_describe_fold(vty, cmd_width, desc_width, desc);</span><br><span> }</span><br><span> </span><br><span> cmd_free_strvec(vline);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20236">change 20236</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/+/20236"/><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: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 </div>
<div style="display:none"> Gerrit-Change-Number: 20236 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>