<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10243">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hlr: Export + Declare global g_hlr symbol<br><br>It is a global variable, and it's sort of bogus if every C file<br>re-declares it as a static global variable that is assigned to the<br>same value as the "real" global one during start-up.<br><br>Change-Id: I6f3e50f071fb2fbbe58413b4760dc2215055a444<br>---<br>M src/hlr.c<br>M src/hlr.h<br>M src/hlr_vty.c<br>M src/hlr_vty.h<br>M src/hlr_vty_subscr.c<br>M src/hlr_vty_subscr.h<br>6 files changed, 9 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 8732587..c38f13f 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> #include "luop.h"</span><br><span> #include "hlr_vty.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hlr *g_hlr;</span><br><span style="color: hsl(120, 100%, 40%);">+struct hlr *g_hlr;</span><br><span> static int quit = 0;</span><br><span> </span><br><span> /* Trigger 'Insert Subscriber Data' messages to all connected GSUP clients.</span><br><span>@@ -569,7 +569,7 @@</span><br><span> vty_init(&vty_info);</span><br><span> ctrl_vty_init(hlr_ctx);</span><br><span> handle_options(argc, argv);</span><br><span style="color: hsl(0, 100%, 40%);">- hlr_vty_init(g_hlr, &hlr_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr_vty_init(&hlr_log_info);</span><br><span> </span><br><span> rc = vty_read_config_file(cmdline_opts.config_file, NULL);</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/hlr.h b/src/hlr.h</span><br><span>index 368a052..8f73806 100644</span><br><span>--- a/src/hlr.h</span><br><span>+++ b/src/hlr.h</span><br><span>@@ -39,6 +39,8 @@</span><br><span> char *gsup_bind_addr;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern struct hlr *g_hlr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct hlr_subscriber;</span><br><span> </span><br><span> void osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr);</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index ecc2f5c..ae27975 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -32,8 +32,6 @@</span><br><span> #include "hlr_vty_subscr.h"</span><br><span> #include "gsup_server.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hlr *g_hlr = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct cmd_node hlr_node = {</span><br><span> HLR_NODE,</span><br><span> "%s(config-hlr)# ",</span><br><span>@@ -152,10 +150,8 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hlr_vty_init(struct hlr *hlr, const struct log_info *cat)</span><br><span style="color: hsl(120, 100%, 40%);">+void hlr_vty_init(const struct log_info *cat)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_hlr = hlr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> logging_vty_add_cmds(cat);</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> </span><br><span>@@ -169,5 +165,5 @@</span><br><span> </span><br><span> install_element(GSUP_NODE, &cfg_hlr_gsup_bind_ip_cmd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- hlr_vty_subscriber_init(hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr_vty_subscriber_init();</span><br><span> }</span><br><span>diff --git a/src/hlr_vty.h b/src/hlr_vty.h</span><br><span>index cd2ff73..bc9c2e5 100644</span><br><span>--- a/src/hlr_vty.h</span><br><span>+++ b/src/hlr_vty.h</span><br><span>@@ -34,4 +34,4 @@</span><br><span> </span><br><span> int hlr_vty_is_config_node(struct vty *vty, int node);</span><br><span> int hlr_vty_go_parent(struct vty *vty);</span><br><span style="color: hsl(0, 100%, 40%);">-void hlr_vty_init(struct hlr *hlr, const struct log_info *cat);</span><br><span style="color: hsl(120, 100%, 40%);">+void hlr_vty_init(const struct log_info *cat);</span><br><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index 4092a8f..9ee6948 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -33,8 +33,6 @@</span><br><span> </span><br><span> #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hlr *g_hlr = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -476,10 +474,8 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hlr_vty_subscriber_init(struct hlr *hlr)</span><br><span style="color: hsl(120, 100%, 40%);">+void hlr_vty_subscriber_init(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_hlr = hlr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> install_element_ve(&subscriber_show_cmd);</span><br><span> install_element(ENABLE_NODE, &subscriber_create_cmd);</span><br><span> install_element(ENABLE_NODE, &subscriber_delete_cmd);</span><br><span>diff --git a/src/hlr_vty_subscr.h b/src/hlr_vty_subscr.h</span><br><span>index 841db5a..5dd0772 100644</span><br><span>--- a/src/hlr_vty_subscr.h</span><br><span>+++ b/src/hlr_vty_subscr.h</span><br><span>@@ -1,3 +1,3 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hlr_vty_subscriber_init(struct hlr *hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+void hlr_vty_subscriber_init(void);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10243">change 10243</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/10243"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6f3e50f071fb2fbbe58413b4760dc2215055a444 </div>
<div style="display:none"> Gerrit-Change-Number: 10243 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>