aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-08-05 16:12:04 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-08-05 16:13:09 +0200
commitb4d8f5cf136fdf8ad444cc9547c7f60803e20711 (patch)
tree117eac612eadf5af8c41f8e735913cfc5e0d02eb
parentcb0cb897add108689c6dc0100ac415b04c006445 (diff)
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
-rw-r--r--include/osmo-bts/vty.h2
-rw-r--r--src/common/main.c2
-rw-r--r--src/common/vty.c4
-rw-r--r--src/osmo-bts-litecell15/misc/lc15bts_mgr.c2
-rw-r--r--src/osmo-bts-oc2g/misc/oc2gbts_mgr.c2
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_mgr.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h
index d90a989d..eab58d6d 100644
--- a/include/osmo-bts/vty.h
+++ b/include/osmo-bts/vty.h
@@ -25,7 +25,7 @@ struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_
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 25ecd11e..6d8088ca 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -249,7 +249,7 @@ int bts_main(int argc, char **argv)
}
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 e4f5a16c..801f34c0 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1600,7 +1600,7 @@ DEFUN(no_bts_t_t_l_loopback,
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 @@ int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat)
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 dbdcc9f0..ccacc1e5 100644
--- a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c
+++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c
@@ -301,7 +301,7 @@ int main(int argc, char **argv)
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 99d2b561..25948b0e 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
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 a0080738..a8289c25 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
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");