<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15048">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds<br><br>Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its<br>parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However,<br>definition in C file doesn't contain "(void)", which means number of<br>parameters is undefined and thus compiler doesn't complain. Let's remove<br>parameters from all callers before enforcing "(void)" on it.<br>API osmo_stats_vty_add_cmds never had a param list but has seem problem<br>(no "void"), so some users decided to pass a parameter to it.<br><br>Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e<br>Related: OS#4138<br>---<br>M include/osmo-bts/vty.h<br>M src/common/main.c<br>M src/common/vty.c<br>M src/osmo-bts-litecell15/misc/lc15bts_mgr.c<br>M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr.c<br>6 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h</span><br><span>index d90a989..eab58d6 100644</span><br><span>--- a/include/osmo-bts/vty.h</span><br><span>+++ b/include/osmo-bts/vty.h</span><br><span>@@ -25,7 +25,7 @@</span><br><span> int bts_vty_go_parent(struct vty *vty);</span><br><span> int bts_vty_is_config_node(struct vty *vty, int node);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat);</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_vty_init(struct gsm_bts *bts);</span><br><span> </span><br><span> struct gsm_network *gsmnet_from_vty(struct vty *v);</span><br><span> </span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 25ecd11..6d8088c 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -249,7 +249,7 @@</span><br><span> }</span><br><span> </span><br><span> e1inp_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">- bts_vty_init(bts, &bts_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_vty_init(bts);</span><br><span> </span><br><span> /* enable realtime priority for us */</span><br><span> if (rt_prio != -1) {</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index e4f5a16..801f34c 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1600,7 +1600,7 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat)</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_vty_init(struct gsm_bts *bts)</span><br><span> {</span><br><span> cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names,</span><br><span> "gsmtap-sapi (",</span><br><span>@@ -1622,7 +1622,7 @@</span><br><span> install_element_ve(&show_lchan_cmd);</span><br><span> install_element_ve(&show_lchan_summary_cmd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- logging_vty_add_cmds(cat);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> osmo_stats_vty_add_cmds();</span><br><span> </span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c</span><br><span>index dbdcc9f..ccacc1e 100644</span><br><span>--- a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c</span><br><span>+++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c</span><br><span>@@ -301,7 +301,7 @@</span><br><span> exit(2);</span><br><span> </span><br><span> lc15bts_mgr_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">- logging_vty_add_cmds(&mgr_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span> rc = lc15bts_mgr_parse_config(&manager);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n");</span><br><span>diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c</span><br><span>index 99d2b56..25948b0 100644</span><br><span>--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c</span><br><span>+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c</span><br><span>@@ -288,7 +288,7 @@</span><br><span> exit(2);</span><br><span> </span><br><span> oc2gbts_mgr_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">- logging_vty_add_cmds(&mgr_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span> rc = oc2gbts_mgr_parse_config(&manager);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n");</span><br><span>diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c</span><br><span>index a008073..a8289c2 100644</span><br><span>--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c</span><br><span>+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c</span><br><span>@@ -270,7 +270,7 @@</span><br><span> exit(2);</span><br><span> </span><br><span> sysmobts_mgr_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">- logging_vty_add_cmds(&mgr_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span> rc = sysmobts_mgr_parse_config(&manager);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15048">change 15048</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/15048"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e </div>
<div style="display:none"> Gerrit-Change-Number: 15048 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>