pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15048
Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Related: OS#4138 --- M include/osmo-bts/vty.h M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c M src/osmo-bts-sysmo/misc/sysmobts_mgr.c 6 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/15048/1 diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index d90a989..eab58d6 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -25,7 +25,7 @@ int bts_vty_go_parent(struct vty *vty); int bts_vty_is_config_node(struct vty *vty, int node); -int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat); +int bts_vty_init(struct gsm_bts *bts); struct gsm_network *gsmnet_from_vty(struct vty *v); diff --git a/src/common/main.c b/src/common/main.c index 25ecd11..6d8088c 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -249,7 +249,7 @@ } e1inp_vty_init(); - bts_vty_init(bts, &bts_log_info); + bts_vty_init(bts); /* enable realtime priority for us */ if (rt_prio != -1) { diff --git a/src/common/vty.c b/src/common/vty.c index e4f5a16..801f34c 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1600,7 +1600,7 @@ return CMD_SUCCESS; } -int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat) +int bts_vty_init(struct gsm_bts *bts) { cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, "gsmtap-sapi (", @@ -1622,7 +1622,7 @@ install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); - logging_vty_add_cmds(cat); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c index dbdcc9f..ccacc1e 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c @@ -301,7 +301,7 @@ exit(2); lc15bts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = lc15bts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c index 99d2b56..25948b0 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c @@ -288,7 +288,7 @@ exit(2); oc2gbts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = oc2gbts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c index a008073..a8289c2 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c @@ -270,7 +270,7 @@ exit(2); sysmobts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = sysmobts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Gerrit-Change-Number: 15048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pes...@sysmocom.de> Gerrit-MessageType: newchange