[MERGED] cellmgr-ng[master]: vty: Adapt the go_parent_cb and fix compiler warning

[Holger Freyther]

Holger Freyther has submitted this change and it was merged.

Change subject: vty: Adapt the go_parent_cb and fix compiler warning
......................................................................


vty: Adapt the go_parent_cb and fix compiler warning

The return type changed from enum to int and it is time to catch
up with it.

vty_interface.c:108:2: warning: initialization from incompatible pointer type
  .go_parent_cb = ss7_go_parent,
  ^
vty_interface.c:108:2: warning: (near initialization for ‘vty_info.go_parent_cb’)

mgcp_ss7_vty.c:36:2: warning: initialization from incompatible pointer type
  .go_parent_cb = mgcp_go_parent,
  ^
mgcp_ss7_vty.c:36:2: warning: (near initialization for ‘vty_info.go_parent_cb’)

Change-Id: I8061df697daf79fa57b8313c15f6567ff152f4a5
---
M src/mgcp/mgcp_vty.c
M src/mgcp_ss7_vty.c
M src/vty_interface.c
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved



diff --git a/src/mgcp/mgcp_vty.c b/src/mgcp/mgcp_vty.c
index e3a7008..dfcc6fe 100644
--- a/src/mgcp/mgcp_vty.c
+++ b/src/mgcp/mgcp_vty.c
@@ -40,7 +40,7 @@
 
 static int allocate_endpoints(struct mgcp_trunk_config *tcfg);
 
-enum node_type mgcp_go_parent(struct vty *vty)
+int mgcp_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
 	case TRUNK_NODE:
diff --git a/src/mgcp_ss7_vty.c b/src/mgcp_ss7_vty.c
index 8ed27ad..5bdb658 100644
--- a/src/mgcp_ss7_vty.c
+++ b/src/mgcp_ss7_vty.c
@@ -29,7 +29,7 @@
 
 extern struct mgcp_config *g_cfg;
 
-enum node_type mgcp_go_parent(struct vty *vty);
+int mgcp_go_parent(struct vty *vty);
 static struct vty_app_info vty_info = {
 	.name 		= "mgcp_ss7",
 	.version	= "0.0.1",
diff --git a/src/vty_interface.c b/src/vty_interface.c
index de250d8..6c6d30f 100644
--- a/src/vty_interface.c
+++ b/src/vty_interface.c
@@ -48,7 +48,7 @@
 
 extern struct bsc_data *bsc;
 
-static enum node_type ss7_go_parent(struct vty *vty)
+static int ss7_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
 	case LINK_NODE:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8061df697daf79fa57b8313c15f6567ff152f4a5
Gerrit-PatchSet: 1
Gerrit-Project: cellmgr-ng
Gerrit-Branch: master
Gerrit-Owner: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder