[PATCH] openbsc[master]: bsc_vty.c: Further simplify vty_get_ts()

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/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun May 28 20:20:05 UTC 2017


Review at  https://gerrit.osmocom.org/2766

bsc_vty.c: Further simplify vty_get_ts()

We can also move the string-to-numeric conversion inside vty_get_ts() to
reduce the amount of work required in the caller.

Change-Id: I2a74ed06e90e39d39f53fff39bb96df172728c0e
---
M openbsc/src/libbsc/bsc_vty.c
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/66/2766/1

diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 6c6b4bc..b5ea8d1 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -3852,8 +3852,12 @@
 }
 
 /* resolve a gsm_bts_trx_ts basd on the given numeric identifiers */
-struct gsm_bts_trx_ts *vty_get_ts(struct vty *vty, int bts_nr, int trx_nr, int ts_nr, int ss_nr)
+static struct gsm_bts_trx_ts *vty_get_ts(struct vty *vty, const char *bts_str, const char *trx_str,
+					 const char *ts_str)
 {
+	int bts_nr = atoi(bts_str);
+	int trx_nr = atoi(trx_str);
+	int ts_nr = atoi(ts_str);
 	struct gsm_bts *bts;
 	struct gsm_bts_trx *trx;
 	struct gsm_bts_trx_ts *ts;
@@ -3883,12 +3887,9 @@
 	"Deactivate Dynamic PDCH/TCH (-> TCH mode)\n")
 {
 	struct gsm_bts_trx_ts *ts;
-	int bts_nr = atoi(argv[0]);
-	int trx_nr = atoi(argv[1]);
-	int ts_nr = atoi(argv[2]);
 	int activate;
 
-	ts = vty_get_ts(vty, bts_nr, trx_nr, ts_nr, 0);
+	ts = vty_get_ts(vty, argv[0], argv[1], argv[2]);
 	if (!ts)
 		return CMD_WARNING;
 
@@ -3900,7 +3901,7 @@
 
 	if (ts->pchan != GSM_PCHAN_TCH_F_PDCH) {
 		vty_out(vty, "%% Timeslot %u is not in dynamic TCH_F/PDCH "
-			"mode%s", ts_nr, VTY_NEWLINE);
+			"mode%s", ts->nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/2766
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a74ed06e90e39d39f53fff39bb96df172728c0e
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>



More information about the gerrit-log mailing list