Change in osmo-bsc[master]: cosmetic: neighbor_ident_vty.c: add and use common string defs

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Tue Aug 28 19:42:19 UTC 2018


Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10632 )

Change subject: cosmetic: neighbor_ident_vty.c: add and use common string defs
......................................................................

cosmetic: neighbor_ident_vty.c: add and use common string defs

The "bts", "lac" and "lac-ci" VTY parameters and documentation are used more
than once in this file. Define once and re-use.

Prepares cosmetically for a fix of the CI format in upcoming
Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f.

Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff
---
M src/osmo-bsc/neighbor_ident_vty.c
1 file changed, 21 insertions(+), 12 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c
index a38d123..993e0b4 100644
--- a/src/osmo-bsc/neighbor_ident_vty.c
+++ b/src/osmo-bsc/neighbor_ident_vty.c
@@ -74,6 +74,15 @@
 #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n"
 #define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n"
 
+#define LAC_PARAMS "lac <0-65535>"
+#define LAC_DOC "Neighbor cell by LAC\n" "LAC\n"
+
+#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>"
+#define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n"
+
+#define LOCAL_BTS_PARAMS "bts <0-255>"
+#define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n"
+
 static struct gsm_bts *neighbor_ident_vty_parse_bts_nr(struct vty *vty, const char **argv)
 {
 	const char *bts_nr_str = argv[0];
@@ -206,22 +215,22 @@
 }
 
 DEFUN(cfg_neighbor_add_bts_nr, cfg_neighbor_add_bts_nr_cmd,
-	NEIGHBOR_ADD_CMD "bts <0-255>",
-	NEIGHBOR_ADD_DOC "Neighbor cell by local BTS number\n" "BTS number\n")
+	NEIGHBOR_ADD_CMD LOCAL_BTS_PARAMS,
+	NEIGHBOR_ADD_DOC LOCAL_BTS_DOC)
 {
 	return add_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv));
 }
 
 DEFUN(cfg_neighbor_add_lac, cfg_neighbor_add_lac_cmd,
-	NEIGHBOR_ADD_CMD "lac <0-65535>",
-	NEIGHBOR_ADD_DOC "Neighbor cell by LAC\n" "LAC\n")
+	NEIGHBOR_ADD_CMD LAC_PARAMS,
+	NEIGHBOR_ADD_DOC LAC_DOC)
 {
 	return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac(vty, argv)));
 }
 
 DEFUN(cfg_neighbor_add_lac_ci, cfg_neighbor_add_lac_ci_cmd,
-	NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255>",
-	NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n")
+	NEIGHBOR_ADD_CMD LAC_CI_PARAMS,
+	NEIGHBOR_ADD_DOC LAC_CI_DOC)
 {
 	return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv)));
 }
@@ -344,8 +353,8 @@
 }
 
 DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd,
-	NEIGHBOR_ADD_CMD "lac <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,
-	NEIGHBOR_ADD_DOC "Neighbor cell by lac\n" "lac\n" NEIGHBOR_IDENT_VTY_KEY_DOC)
+	NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,
+	NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)
 {
 	struct neighbor_ident_key nik;
 	struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac(vty, argv);
@@ -357,8 +366,8 @@
 }
 
 DEFUN(cfg_neighbor_add_lac_ci_arfcn_bsic, cfg_neighbor_add_lac_ci_arfcn_bsic_cmd,
-	NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,
-	NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC)
+	NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,
+	NEIGHBOR_ADD_DOC LAC_CI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)
 {
 	struct neighbor_ident_key nik;
 	struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac_ci(vty, argv);
@@ -383,8 +392,8 @@
 }
 
 DEFUN(cfg_neighbor_del_bts_nr, cfg_neighbor_del_bts_nr_cmd,
-	NEIGHBOR_DEL_CMD "bts <0-255>",
-	NEIGHBOR_DEL_DOC "Neighbor cell by local BTS number\n" "BTS number\n")
+	NEIGHBOR_DEL_CMD LOCAL_BTS_PARAMS,
+	NEIGHBOR_DEL_DOC LOCAL_BTS_DOC)
 {
 	return del_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv));
 }

-- 
To view, visit https://gerrit.osmocom.org/10632
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff
Gerrit-Change-Number: 10632
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180828/227d7bb0/attachment.htm>


More information about the gerrit-log mailing list