aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-01-12 19:35:11 +0100
committerMax <msuraev@sysmocom.de>2017-02-08 09:37:38 +0000
commitdb0e380558fa03229d981dc358db98d5b781cbe5 (patch)
tree17add1efa9348ce6a64ed8a5031fbe83644dc5dc
parent50422016f0386bb17b94196178ed5fffb6598fc6 (diff)
vty: remove ignored logging parameters
Since ce9fec3e896571835ac5bfd2980d6836f2b29f0d libosmocore ignores parameters to log_vty_command_* functions. Hence parameter of logging_vty_add_cmds() is ignored too. As we depend on much later libosmocore version anyway, we can simplify code somewhat by removing parameters which will be ignored anyway. Change-Id: I62f752fd88f1d8fefa563648f9864c7c31f87991
-rw-r--r--openbsc/include/openbsc/vty.h2
-rw-r--r--openbsc/src/gprs/gb_proxy_main.c2
-rw-r--r--openbsc/src/gprs/gtphub_main.c2
-rw-r--r--openbsc/src/gprs/sgsn_main.c2
-rw-r--r--openbsc/src/libbsc/bsc_vty.c4
-rw-r--r--openbsc/src/osmo-bsc/osmo_bsc_main.c2
-rw-r--r--openbsc/src/osmo-bsc_mgcp/mgcp_main.c2
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat.c2
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat_vty.c4
-rw-r--r--openbsc/src/osmo-nitb/bsc_hack.c2
10 files changed, 12 insertions, 12 deletions
diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h
index ad2cd2a8..f79eab58 100644
--- a/openbsc/include/openbsc/vty.h
+++ b/openbsc/include/openbsc/vty.h
@@ -44,7 +44,7 @@ extern int bsc_vty_is_config_node(struct vty *vty, int node);
extern void bsc_replace_string(void *ctx, char **dst, const char *newstr);
struct log_info;
-int bsc_vty_init(const struct log_info *cat, struct gsm_network *network);
+int bsc_vty_init(struct gsm_network *network);
int bsc_vty_init_extra(void);
struct gsm_network *gsmnet_from_vty(struct vty *vty);
diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c
index 04875c7c..69a93b6f 100644
--- a/openbsc/src/gprs/gb_proxy_main.c
+++ b/openbsc/src/gprs/gb_proxy_main.c
@@ -241,7 +241,7 @@ int main(int argc, char **argv)
vty_info.copyright = openbsc_copyright;
vty_init(&vty_info);
- logging_vty_add_cmds(&gprs_log_info);
+ logging_vty_add_cmds(NULL);
osmo_stats_vty_add_cmds(&gprs_log_info);
gbproxy_vty_init();
diff --git a/openbsc/src/gprs/gtphub_main.c b/openbsc/src/gprs/gtphub_main.c
index 46360f94..73a122c3 100644
--- a/openbsc/src/gprs/gtphub_main.c
+++ b/openbsc/src/gprs/gtphub_main.c
@@ -311,7 +311,7 @@ int main(int argc, char **argv)
vty_info.copyright = gtphub_copyright;
vty_init(&vty_info);
- logging_vty_add_cmds(&gtphub_log_info);
+ logging_vty_add_cmds(NULL);
gtphub_vty_init(hub, cfg);
rate_ctr_init(osmo_gtphub_ctx);
diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c
index b4be6318..af5cced6 100644
--- a/openbsc/src/gprs/sgsn_main.c
+++ b/openbsc/src/gprs/sgsn_main.c
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
vty_info.copyright = openbsc_copyright;
vty_init(&vty_info);
- logging_vty_add_cmds(&gprs_log_info);
+ logging_vty_add_cmds(NULL);
osmo_stats_vty_add_cmds(&gprs_log_info);
sgsn_vty_init();
ctrl_vty_init(tall_bsc_ctx);
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 7d3b4afa..00acbc7a 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -3851,7 +3851,7 @@ DEFUN(pdch_act, pdch_act_cmd,
extern int bsc_vty_init_extra(void);
-int bsc_vty_init(const struct log_info *cat, struct gsm_network *network)
+int bsc_vty_init(struct gsm_network *network)
{
cfg_ts_pchan_cmd.string =
vty_cmd_string_from_valstr(tall_bsc_ctx,
@@ -3887,7 +3887,7 @@ int bsc_vty_init(const struct log_info *cat, struct gsm_network *network)
install_element_ve(&show_paging_cmd);
install_element_ve(&show_paging_group_cmd);
- logging_vty_add_cmds(cat);
+ logging_vty_add_cmds(NULL);
osmo_stats_vty_add_cmds();
install_element(GSMNET_NODE, &cfg_net_neci_cmd);
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index 1d96bb41..adce7751 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -212,7 +212,7 @@ int main(int argc, char **argv)
/* This needs to precede handle_options() */
vty_info.copyright = openbsc_copyright;
vty_init(&vty_info);
- bsc_vty_init(&log_info, bsc_gsmnet);
+ bsc_vty_init(bsc_gsmnet);
bsc_msg_lst_vty_init(tall_bsc_ctx, &access_lists, BSC_NODE);
ctrl_vty_init(tall_bsc_ctx);
diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
index 964768e0..4ea07007 100644
--- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
+++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
@@ -220,7 +220,7 @@ int main(int argc, char **argv)
vty_info.copyright = openbsc_copyright;
vty_init(&vty_info);
- logging_vty_add_cmds(&log_info);
+ logging_vty_add_cmds(NULL);
osmo_stats_vty_add_cmds(&log_info);
mgcp_vty_init();
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index a4dd6790..80e89fd5 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -1616,7 +1616,7 @@ int main(int argc, char **argv)
vty_info.copyright = openbsc_copyright;
vty_init(&vty_info);
- logging_vty_add_cmds(&log_info);
+ logging_vty_add_cmds(NULL);
osmo_stats_vty_add_cmds(&log_info);
bsc_nat_vty_init(nat);
ctrl_vty_init(tall_bsc_ctx);
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 706e5074..deb98fcd 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -1329,8 +1329,8 @@ int bsc_nat_vty_init(struct bsc_nat *nat)
/* called by the telnet interface... we have our own init above */
-int bsc_vty_init(const struct log_info *cat, struct gsm_network *network)
+int bsc_vty_init(struct gsm_network *network)
{
- logging_vty_add_cmds(cat);
+ logging_vty_add_cmds(NULL);
return 0;
}
diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c
index bbcdd1be..2bdfada9 100644
--- a/openbsc/src/osmo-nitb/bsc_hack.c
+++ b/openbsc/src/osmo-nitb/bsc_hack.c
@@ -283,7 +283,7 @@ int main(int argc, char **argv)
}
/* Initialize VTY */
- bsc_vty_init(&log_info, bsc_gsmnet);
+ bsc_vty_init(bsc_gsmnet);
ctrl_vty_init(tall_bsc_ctx);
#ifdef BUILD_SMPP