<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10632">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: neighbor_ident_vty.c: add and use common string defs<br><br>The "bts", "lac" and "lac-ci" VTY parameters and documentation are used more<br>than once in this file. Define once and re-use.<br><br>Prepares cosmetically for a fix of the CI format in upcoming<br>Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f.<br><br>Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>1 file changed, 21 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>index a38d123..993e0b4 100644</span><br><span>--- a/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>+++ b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>@@ -74,6 +74,15 @@</span><br><span> #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n"</span><br><span> #define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_PARAMS "lac <0-65535>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_DOC "Neighbor cell by LAC\n" "LAC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOCAL_BTS_PARAMS "bts <0-255>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct gsm_bts *neighbor_ident_vty_parse_bts_nr(struct vty *vty, const char **argv)</span><br><span> {</span><br><span>   const char *bts_nr_str = argv[0];</span><br><span>@@ -206,22 +215,22 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_bts_nr, cfg_neighbor_add_bts_nr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-       NEIGHBOR_ADD_CMD "bts <0-255>",</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_DOC "Neighbor cell by local BTS number\n" "BTS number\n")</span><br><span style="color: hsl(120, 100%, 40%);">+    NEIGHBOR_ADD_CMD LOCAL_BTS_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+    NEIGHBOR_ADD_DOC LOCAL_BTS_DOC)</span><br><span> {</span><br><span>         return add_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv));</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac, cfg_neighbor_add_lac_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-        NEIGHBOR_ADD_CMD "lac <0-65535>",</span><br><span style="color: hsl(0, 100%, 40%);">-       NEIGHBOR_ADD_DOC "Neighbor cell by LAC\n" "LAC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+        NEIGHBOR_ADD_CMD LAC_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+  NEIGHBOR_ADD_DOC LAC_DOC)</span><br><span> {</span><br><span>       return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac(vty, argv)));</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac_ci, cfg_neighbor_add_lac_ci_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-        NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255>",</span><br><span style="color: hsl(0, 100%, 40%);">-      NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n")</span><br><span style="color: hsl(120, 100%, 40%);">+        NEIGHBOR_ADD_CMD LAC_CI_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+       NEIGHBOR_ADD_DOC LAC_CI_DOC)</span><br><span> {</span><br><span>    return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv)));</span><br><span> }</span><br><span>@@ -344,8 +353,8 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-  NEIGHBOR_ADD_CMD "lac <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">-        NEIGHBOR_ADD_DOC "Neighbor cell by lac\n" "lac\n" NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+     NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+      NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span> {</span><br><span>    struct neighbor_ident_key nik;</span><br><span>       struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac(vty, argv);</span><br><span>@@ -357,8 +366,8 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac_ci_arfcn_bsic, cfg_neighbor_add_lac_ci_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-  NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">-       NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+     NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+   NEIGHBOR_ADD_DOC LAC_CI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span> {</span><br><span>         struct neighbor_ident_key nik;</span><br><span>       struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac_ci(vty, argv);</span><br><span>@@ -383,8 +392,8 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_del_bts_nr, cfg_neighbor_del_bts_nr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-     NEIGHBOR_DEL_CMD "bts <0-255>",</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_DEL_DOC "Neighbor cell by local BTS number\n" "BTS number\n")</span><br><span style="color: hsl(120, 100%, 40%);">+    NEIGHBOR_DEL_CMD LOCAL_BTS_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+    NEIGHBOR_DEL_DOC LOCAL_BTS_DOC)</span><br><span> {</span><br><span>         return del_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv));</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10632">change 10632</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/10632"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff </div>
<div style="display:none"> Gerrit-Change-Number: 10632 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>