Change in libosmo-sccp[master]: sccp_vty: define SCCP_STR once

[Neels Hofmeyr]

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

Change subject: sccp_vty: define SCCP_STR once
......................................................................

sccp_vty: define SCCP_STR once

Define SCCP_STR in sccp_internal.h, because I know that I want to also use it
in osmo_ss7_vty.c.

Fix "Signaling" to "Signalling" upon copying the old string.

Change-Id: Ic93e4771147070a9222c73f80b5f7c29ae7eec35
---
M src/sccp_internal.h
M src/sccp_vty.c
M tests/vty/ss7_asp_test.vty
3 files changed, 6 insertions(+), 7 deletions(-)

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



diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index 66d768d..651862f 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -5,6 +5,8 @@
 #include <osmocom/sigtran/sccp_sap.h>
 #include <osmocom/sigtran/osmo_ss7.h>
 
+#define SCCP_STR "Signalling Connection Control Part\n"
+
 /* an instance of the SCCP stack */
 struct osmo_sccp_instance {
 	/* entry in global list of ss7 instances */
diff --git a/src/sccp_vty.c b/src/sccp_vty.c
index bcedbb6..2727ccc 100644
--- a/src/sccp_vty.c
+++ b/src/sccp_vty.c
@@ -54,8 +54,7 @@
 
 DEFUN(show_sccp_users, show_sccp_users_cmd,
 	"show cs7 instance <0-15> sccp users",
-	SHOW_STR CS7_STR INST_STR INST_STR
-	"Signaling Connection Control Part\n"
+	SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR
 	"Show List of SCCP Users registered\n")
 {
 	int id = atoi(argv[0]);
@@ -83,8 +82,7 @@
 
 DEFUN(show_sccp_user_ssn, show_sccp_user_ssn_cmd,
 	"show cs7 instance <0-15> sccp ssn <0-65535>",
-	SHOW_STR CS7_STR INST_STR INST_STR
-	"Signaling Connection Control Part\n"
+	SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR
 	"Show List of SCCP Users registered\n")
 {
 	int id = atoi(argv[0]);
@@ -118,8 +116,7 @@
 
 DEFUN(show_sccp_connections, show_sccp_connections_cmd,
 	"show cs7 instance <0-15> sccp connections",
-	SHOW_STR CS7_STR INST_STR INST_STR
-	"Signaling Connection Control Part\n"
+	SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR
 	"Show List of SCCP Users registered\n")
 {
 	int id = atoi(argv[0]);
diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty
index fc46cff..9a86b23 100644
--- a/tests/vty/ss7_asp_test.vty
+++ b/tests/vty/ss7_asp_test.vty
@@ -42,7 +42,7 @@
   users  User Table
   asp    Application Server Process (ASP)
   as     Application Server (AS)
-  sccp   Signaling Connection Control Part
+  sccp   Signalling Connection Control Part
 
 ss7_asp_vty_test# show cs7 instance 0 as ?
   active  Display all active ASs

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic93e4771147070a9222c73f80b5f7c29ae7eec35
Gerrit-Change-Number: 11115
Gerrit-PatchSet: 2
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/20180927/ebf5659f/attachment.htm>