laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved
ctrl: Mark function as static

Also move it more towards the end, where it is more expected as usually
done in ctrl/vty code.

Change-Id: Ieb956fb855752cfbe83d11aa0326685229a115e3
---
M include/osmocom/hlr/ctrl.h
M src/ctrl.c
2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/osmocom/hlr/ctrl.h b/include/osmocom/hlr/ctrl.h
index 3f9ba3f..6ca9163 100644
--- a/include/osmocom/hlr/ctrl.h
+++ b/include/osmocom/hlr/ctrl.h
@@ -30,5 +30,4 @@
_LAST_CTRL_NODE_HLR
};

-int hlr_ctrl_cmds_install();
struct ctrl_handle *hlr_controlif_setup(struct hlr *hlr);
diff --git a/src/ctrl.c b/src/ctrl.c
index b78be12..37177c5 100644
--- a/src/ctrl.c
+++ b/src/ctrl.c
@@ -351,19 +351,6 @@
return set_subscr_cs_ps_enabled(cmd, data, false);
}

-int hlr_ctrl_cmds_install()
-{
- int rc = 0;
-
- rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info);
- rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info_aud);
- rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info_all);
- rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_ps_enabled);
- rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_cs_enabled);
-
- return rc;
-}
-
static int hlr_ctrl_node_lookup(void *data, vector vline, int *node_type,
void **node_data, int *i)
{
@@ -389,6 +376,19 @@
return 1;
}

+static int hlr_ctrl_cmds_install()
+{
+ int rc = 0;
+
+ rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info);
+ rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info_aud);
+ rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info_all);
+ rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_ps_enabled);
+ rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_cs_enabled);
+
+ return rc;
+}
+
struct ctrl_handle *hlr_controlif_setup(struct hlr *hlr)
{
int rc;

To view, visit change 28313. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: Ieb956fb855752cfbe83d11aa0326685229a115e3
Gerrit-Change-Number: 28313
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged