<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24290">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: ensure all warning messages are prefixed with '%%'<br><br>Change-Id: I23fc1cd8aa5725de06651f061c9fce6a022adfa8<br>---<br>M src/common/vty.c<br>1 file changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/24290/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 4bf9761..3aa8712 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -94,14 +94,14 @@</span><br><span> struct phy_instance *pinst;</span><br><span> </span><br><span> if (!plink) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot find PHY link number %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot find PHY link number %d%s",</span><br><span> phy_nr, VTY_NEWLINE);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span> pinst = phy_instance_by_num(plink, inst_nr);</span><br><span> if (!pinst) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot find PHY instance number %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot find PHY instance number %d%s",</span><br><span> inst_nr, VTY_NEWLINE);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -559,19 +559,19 @@</span><br><span> end = atoi(argv[1]);</span><br><span> </span><br><span> if (end < start) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "range end port (%u) must be greater than the range start port (%u)!%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Range end port (%u) must be greater than the range start port (%u)!%s",</span><br><span> end, start, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if (start & 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "range must begin at an even port number! (%u not even)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Range must begin at an even port number! (%u is odd)%s",</span><br><span> start, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if ((end & 1) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "range must end at an odd port number! (%u not odd)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Range must end at an odd port number! (%u is even)%s",</span><br><span> end, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -952,11 +952,11 @@</span><br><span> * has been ripped out in favour of the common implementation. Configuration files</span><br><span> * may still contain 'dsp', so let's be tolerant and override 'dsp' by 'osmo'. */</span><br><span> if (trx->bts->variant == BTS_OSMO_TRX && vty->type == VTY_FILE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS model 'osmo-bts-trx' has no DSP/HW MS Power Control support, "</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS model 'osmo-bts-trx' has no DSP/HW MS Power Control support, "</span><br><span> "consider updating your configuration file!%s", VTY_NEWLINE);</span><br><span> soft = true; /* override */</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This BTS model has no DSP/HW MS Power Control support%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This BTS model has no DSP/HW MS Power Control support%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> }</span><br><span>@@ -975,20 +975,20 @@</span><br><span> struct phy_instance *pinst;</span><br><span> </span><br><span> if (!plink) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "phy%s does not exist%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% phy%s does not exist%s",</span><br><span> argv[0], VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> pinst = phy_instance_by_num(plink, atoi(argv[1]));</span><br><span> if (!pinst) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "phy%s instance %s does not exit%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% phy%s instance %s does not exit%s",</span><br><span> argv[0], argv[1], VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if (pinst->trx != NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "phy%s instance %s is already bound to %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% phy%s instance %s is already bound to %s%s",</span><br><span> argv[0], argv[1], gsm_trx_name(pinst->trx), VTY_NEWLINE);</span><br><span> /* Be tolerant in the interactive VTY mode */</span><br><span> if (vty->type == VTY_FILE)</span><br><span>@@ -2045,7 +2045,7 @@</span><br><span> if (!pinst) {</span><br><span> pinst = phy_instance_create(plink, inst_nr);</span><br><span> if (!pinst) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to create phy%u instance %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to create phy%u instance %u%s",</span><br><span> plink->num, inst_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -2068,7 +2068,7 @@</span><br><span> </span><br><span> pinst = phy_instance_by_num(plink, inst_nr);</span><br><span> if (!pinst) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "No such instance %u%s", inst_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such instance %u%s", inst_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -2088,7 +2088,7 @@</span><br><span> struct phy_link *plink = vty->index;</span><br><span> </span><br><span> if (plink->state != PHY_LINK_SHUTDOWN) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot change type of active PHY%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot change type of active PHY%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24290">change 24290</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/osmo-bts/+/24290"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I23fc1cd8aa5725de06651f061c9fce6a022adfa8 </div>
<div style="display:none"> Gerrit-Change-Number: 24290 </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>