diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-09-24 15:38:38 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-09-24 15:39:30 +0200 |
| commit | 3e4e8cfb74bed5dafb1c9d6c46aa18841ac40830 (patch) | |
| tree | 84a83d376de12c96346bfca2b8835d288b0b1ca7 | |
| parent | 925504bfe0834be6b1549af51242ef24fa2a0eaa (diff) | |
vty: Change the return type from enum to int
clang complained that different enums are mixed with the
return type and we actually want this to be an int now.
| -rw-r--r-- | openbsc/src/gprs/gb_proxy_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/gprs/sgsn_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libcommon/common_vty.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-nitb/bsc_hack.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index 3da0abed2..45b45a454 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -189,7 +189,7 @@ static void handle_options(int argc, char **argv) extern void *tall_msgb_ctx; -extern enum node_type bsc_vty_go_parent(struct vty *vty); +extern int bsc_vty_go_parent(struct vty *vty); static struct vty_app_info vty_info = { .name = "OsmoGbProxy", diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index 8cb749939..176501a3a 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -158,7 +158,7 @@ static void signal_handler(int signal) extern struct gprs_ns_inst *bssgp_nsi; extern void *tall_msgb_ctx; -extern enum node_type bsc_vty_go_parent(struct vty *vty); +extern int bsc_vty_go_parent(struct vty *vty); static struct vty_app_info vty_info = { .name = "OsmoSGSN", diff --git a/openbsc/src/libcommon/common_vty.c b/openbsc/src/libcommon/common_vty.c index 186fbe0b7..a0674f0f1 100644 --- a/openbsc/src/libcommon/common_vty.c +++ b/openbsc/src/libcommon/common_vty.c @@ -35,7 +35,7 @@ #include <osmocom/vty/vty.h> -enum node_type bsc_vty_go_parent(struct vty *vty) +int bsc_vty_go_parent(struct vty *vty) { switch (vty->node) { case GSMNET_NODE: diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index ee86cb647..3ab126774 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -142,7 +142,7 @@ static void handle_options(int argc, char **argv) } } -extern enum node_type bsc_vty_go_parent(struct vty *vty); +extern int bsc_vty_go_parent(struct vty *vty); static struct vty_app_info vty_info = { .name = "OsmoBSC", diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 1c03f27d4..daa07c296 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -184,7 +184,7 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) return 0; } -extern enum node_type bsc_vty_go_parent(struct vty *vty); +extern int bsc_vty_go_parent(struct vty *vty); static struct vty_app_info vty_info = { .name = "OpenBSC MGCP", diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index c70153fd2..56c628667 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1587,7 +1587,7 @@ static void talloc_init_ctx() tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); } -extern enum node_type bsc_vty_go_parent(struct vty *vty); +extern int bsc_vty_go_parent(struct vty *vty); static struct vty_app_info vty_info = { .name = "OsmoBSCNAT", diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c index 75229b92b..7229a9b2f 100644 --- a/openbsc/src/osmo-nitb/bsc_hack.c +++ b/openbsc/src/osmo-nitb/bsc_hack.c @@ -235,7 +235,7 @@ static void subscr_expire_cb(void *data) void talloc_ctx_init(void); -extern enum node_type bsc_vty_go_parent(struct vty *vty); +extern int bsc_vty_go_parent(struct vty *vty); static struct vty_app_info vty_info = { .name = "OpenBSC", |