<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15039">View Change</a></p><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>Related: OS#4138<br>Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216<br>---<br>M src/pcu_main.cpp<br>M src/pcu_vty.c<br>M src/pcu_vty.h<br>M tests/edge/EdgeTest.cpp<br>M tests/emu/pcu_emu.cpp<br>M tests/llc/LlcTest.cpp<br>M tests/ms/MsTest.cpp<br>M tests/tbf/TbfTest.cpp<br>8 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/39/15039/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp</span><br><span>index fa075cd..21cb244 100644</span><br><span>--- a/src/pcu_main.cpp</span><br><span>+++ b/src/pcu_main.cpp</span><br><span>@@ -277,7 +277,7 @@</span><br><span> bssgp_set_log_ss(DBSSGP);</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_vty_init(&gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_vty_init();</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span> if ((!!spoof_mcc) + (!!spoof_mnc) == 1) {</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 3a733ef..1e4f50c 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -1147,7 +1147,7 @@</span><br><span> .is_config_node = pcu_vty_is_config_node,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_init(const struct log_info *cat)</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_init(void)</span><br><span> {</span><br><span> // install_element_ve(&show_pcu_cmd);</span><br><span> </span><br><span>@@ -1164,8 +1164,8 @@</span><br><span> NO_STR "GSMTAP Category\n",</span><br><span> "\n", "", 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- logging_vty_add_cmds(cat);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stats_vty_add_cmds(cat);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_vty_add_cmds();</span><br><span> </span><br><span> install_node(&pcu_node, config_write_pcu);</span><br><span> install_element(CONFIG_NODE, &cfg_pcu_cmd);</span><br><span>diff --git a/src/pcu_vty.h b/src/pcu_vty.h</span><br><span>index a075350..2097561 100644</span><br><span>--- a/src/pcu_vty.h</span><br><span>+++ b/src/pcu_vty.h</span><br><span>@@ -12,7 +12,7 @@</span><br><span> int pcu_vty_go_parent(struct vty *vty);</span><br><span> int pcu_vty_is_config_node(struct vty *vty, int node);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_init(const struct log_info *cat);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_init();</span><br><span> </span><br><span> extern struct vty_app_info pcu_vty_info;</span><br><span> </span><br><span>diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp</span><br><span>index f124b76..3f424d1 100644</span><br><span>--- a/tests/edge/EdgeTest.cpp</span><br><span>+++ b/tests/edge/EdgeTest.cpp</span><br><span>@@ -1411,7 +1411,7 @@</span><br><span> log_set_print_filename(osmo_stderr_target, 0);</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_vty_init(&gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_vty_init();</span><br><span> </span><br><span> test_coding_scheme();</span><br><span> test_rlc_info_init();</span><br><span>diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp</span><br><span>index e0190bf..7ecabe1 100644</span><br><span>--- a/tests/emu/pcu_emu.cpp</span><br><span>+++ b/tests/emu/pcu_emu.cpp</span><br><span>@@ -121,7 +121,7 @@</span><br><span> }</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_vty_init(&gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_vty_init();</span><br><span> </span><br><span> current_test = 0;</span><br><span> </span><br><span>diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp</span><br><span>index 13bda3c..8163f34 100644</span><br><span>--- a/tests/llc/LlcTest.cpp</span><br><span>+++ b/tests/llc/LlcTest.cpp</span><br><span>@@ -229,7 +229,7 @@</span><br><span> log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:");</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_vty_init(&gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_vty_init();</span><br><span> </span><br><span> test_llc_queue();</span><br><span> test_llc_meta();</span><br><span>diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp</span><br><span>index 4f8f3a0..c74b3a6 100644</span><br><span>--- a/tests/ms/MsTest.cpp</span><br><span>+++ b/tests/ms/MsTest.cpp</span><br><span>@@ -616,7 +616,7 @@</span><br><span> log_parse_category_mask(osmo_stderr_target, "DPCU,3:DRLCMAC,3");</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_vty_init(&gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_vty_init();</span><br><span> </span><br><span> test_ms_state();</span><br><span> test_ms_callback();</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 675cf89..8d1b344 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -3290,7 +3290,7 @@</span><br><span> "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:");</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_vty_init(&gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_vty_init();</span><br><span> </span><br><span> test_tbf_base();</span><br><span> test_tbf_tlli_update();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15039">change 15039</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-pcu/+/15039"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 </div>
<div style="display:none"> Gerrit-Change-Number: 15039 </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-MessageType: newchange </div>