[MERGED] osmocom-bb[master]: mobile/vty_interface.c: fix incompatible pointer type warning

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: mobile/vty_interface.c: fix incompatible pointer type warning
......................................................................


mobile/vty_interface.c: fix incompatible pointer type warning

According to the vty_app_info struct definition, the go_parent_cb()
should return an integer, but not enum. So, this change fixes the
following compiler warning:

> warning: initialization from incompatible pointer type
>   .go_parent_cb = ms_vty_go_parent,

Change-Id: Ib55e43eaaebdd9fe0d74a030b1057ae82804a77e
---
M src/host/layer23/include/osmocom/bb/mobile/vty.h
M src/host/layer23/src/mobile/vty_interface.c
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h
index 1f1341b..3bec113 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/vty.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h
@@ -12,7 +12,7 @@
 	SUPPORT_NODE,
 };
 
-enum node_type ms_vty_go_parent(struct vty *vty);
+int ms_vty_go_parent(struct vty *vty);
 int ms_vty_init(void);
 extern void vty_notify(struct osmocom_ms *ms, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 
diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c
index b3777dc..0f27194 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -2757,7 +2757,7 @@
 	return CMD_SUCCESS;
 }
 
-enum node_type ms_vty_go_parent(struct vty *vty)
+int ms_vty_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
 	case MS_NODE:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib55e43eaaebdd9fe0d74a030b1057ae82804a77e
Gerrit-PatchSet: 2
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>