From e1135751685c6b914fe67b03ccc1c27a5a7a47cb Mon Sep 17 00:00:00 2001 From: Daniel Danzberger Date: Sun, 22 Dec 2019 00:49:37 +0100 Subject: [PATCH] Fix undefined reference errors when linking aginst libbbfdm.so Signed-off-by: Daniel Danzberger --- dmtree/tr181/atm.c | 2 +- dmtree/tr181/bridging.c | 6 +++--- dmtree/tr181/deviceinfo.c | 2 +- dmtree/tr181/dhcpv4.c | 6 +++--- dmtree/tr181/dhcpv6.c | 4 ++-- dmtree/tr181/dsl.c | 4 ++-- dmtree/tr181/ethernet.c | 2 +- dmtree/tr181/hosts.c | 2 +- dmtree/tr181/ip.c | 6 +++--- dmtree/tr181/ptm.c | 2 +- dmtree/tr181/routing.c | 4 ++-- dmtree/tr181/wifi.c | 8 ++++---- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dmtree/tr181/atm.c b/dmtree/tr181/atm.c index 08ee0eed..b32c0780 100644 --- a/dmtree/tr181/atm.c +++ b/dmtree/tr181/atm.c @@ -64,7 +64,7 @@ int get_atm_linker(char *refparam, struct dmctx *dmctx, void *data, char *instan /************************************************************************** * INIT ***************************************************************************/ -inline int init_atm_link(struct atm_args *args, struct uci_section *s, char *ifname) +static inline int init_atm_link(struct atm_args *args, struct uci_section *s, char *ifname) { args->atm_sec = s; args->ifname = ifname; diff --git a/dmtree/tr181/bridging.c b/dmtree/tr181/bridging.c index 6b6a1a12..80e433ce 100644 --- a/dmtree/tr181/bridging.c +++ b/dmtree/tr181/bridging.c @@ -149,7 +149,7 @@ int get_linker_br_vlan(char *refparam, struct dmctx *dmctx, void *data, char *in /************************************************************************** * INIT ***************************************************************************/ -inline int init_bridging_args(struct bridging_args *args, struct uci_section *s, char *last_instance, char *ifname, char *br_instance) +static inline int init_bridging_args(struct bridging_args *args, struct uci_section *s, char *last_instance, char *ifname, char *br_instance) { args->bridge_sec = s; args->br_key = last_instance; @@ -158,7 +158,7 @@ inline int init_bridging_args(struct bridging_args *args, struct uci_section *s, return 0; } -inline int init_bridging_port_args(struct bridging_port_args *args, struct uci_section *s, struct uci_section *bs, bool vlan, char *ifname) +static inline int init_bridging_port_args(struct bridging_port_args *args, struct uci_section *s, struct uci_section *bs, bool vlan, char *ifname) { args->bridge_port_sec = s; args->bridge_sec = bs; @@ -167,7 +167,7 @@ inline int init_bridging_port_args(struct bridging_port_args *args, struct uci_s return 0; } -inline int init_bridging_vlan_args(struct bridging_vlan_args *args, struct uci_section *s, struct uci_section *bs, char *vlan_port, char *br_inst) +static inline int init_bridging_vlan_args(struct bridging_vlan_args *args, struct uci_section *s, struct uci_section *bs, char *vlan_port, char *br_inst) { args->bridge_vlan_sec = s; args->bridge_sec = bs; diff --git a/dmtree/tr181/deviceinfo.c b/dmtree/tr181/deviceinfo.c index 6bcacaa9..36082a61 100644 --- a/dmtree/tr181/deviceinfo.c +++ b/dmtree/tr181/deviceinfo.c @@ -111,7 +111,7 @@ DMLEAF tDeviceInfoVendorLogFileParams[] = { /************************************************************* * INIT **************************************************************/ -inline int init_process_args(struct process_args *args, char *pid, char *command, char* size, char* priority, char *cputime, char *state) +static inline int init_process_args(struct process_args *args, char *pid, char *command, char* size, char* priority, char *cputime, char *state) { args->pid = pid; args->command= command; diff --git a/dmtree/tr181/dhcpv4.c b/dmtree/tr181/dhcpv4.c index 9bd689a8..d50ac95a 100644 --- a/dmtree/tr181/dhcpv4.c +++ b/dmtree/tr181/dhcpv4.c @@ -228,20 +228,20 @@ int get_dhcp_client_linker(char *refparam, struct dmctx *dmctx, void *data, char /************************************************************* * INIT **************************************************************/ -inline int init_dhcp_args(struct dhcp_args *args, struct uci_section *s, char *interface) +static inline int init_dhcp_args(struct dhcp_args *args, struct uci_section *s, char *interface) { args->interface = interface; args->dhcp_sec = s; return 0; } -inline int init_args_dhcp_host(struct dhcp_static_args *args, struct uci_section *s) +static inline int init_args_dhcp_host(struct dhcp_static_args *args, struct uci_section *s) { args->dhcpsection = s; return 0; } -inline int init_dhcp_client_args(struct client_args *args, json_object *client, char *key) +static inline int init_dhcp_client_args(struct client_args *args, json_object *client, char *key) { args->client = client; args->key = key; diff --git a/dmtree/tr181/dhcpv6.c b/dmtree/tr181/dhcpv6.c index 9d12d202..50c02344 100644 --- a/dmtree/tr181/dhcpv6.c +++ b/dmtree/tr181/dhcpv6.c @@ -204,7 +204,7 @@ struct uci_section* get_dhcpv6_classifier(char *classifier_name, char *network) return NULL; } -inline int init_dhcpv6_client_args(struct clientv6_args *args, json_object *client, json_object *client_param, int i) +static inline int init_dhcpv6_client_args(struct clientv6_args *args, json_object *client, json_object *client_param, int i) { args->client = client; args->clientparam = client_param; @@ -258,7 +258,7 @@ int set_section_dhcp6_order(char *package, char *dmpackage, char* sect_type, str } -inline int init_dhcpv6_args(struct dhcpv6_args *args, struct uci_section *s, char *interface) +static inline int init_dhcpv6_args(struct dhcpv6_args *args, struct uci_section *s, char *interface) { args->interface = interface; args->dhcp_sec = s; diff --git a/dmtree/tr181/dsl.c b/dmtree/tr181/dsl.c index de306b26..bcc39545 100644 --- a/dmtree/tr181/dsl.c +++ b/dmtree/tr181/dsl.c @@ -286,13 +286,13 @@ int get_dsl_channel_linker(char *refparam, struct dmctx *dmctx, void *data, char /************************************************************************** * INIT ***************************************************************************/ -inline int init_dsl_line(struct dsl_line_args *args, struct uci_section *s) +static inline int init_dsl_line(struct dsl_line_args *args, struct uci_section *s) { args->line_sec = s; return 0; } -inline int init_dsl_channel(struct dsl_channel_args *args, struct uci_section *s) +static inline int init_dsl_channel(struct dsl_channel_args *args, struct uci_section *s) { args->channel_sec = s; return 0; diff --git a/dmtree/tr181/ethernet.c b/dmtree/tr181/ethernet.c index e76f59ae..e83313b5 100644 --- a/dmtree/tr181/ethernet.c +++ b/dmtree/tr181/ethernet.c @@ -161,7 +161,7 @@ DMLEAF tEthernetVLANTerminationStatsParams[] = { /************************************************************* * INIT **************************************************************/ -inline int init_eth_port(struct eth_port_args *args, struct uci_section *s, char *ifname) +static inline int init_eth_port(struct eth_port_args *args, struct uci_section *s, char *ifname) { args->eth_port_sec = s; args->ifname = ifname; diff --git a/dmtree/tr181/hosts.c b/dmtree/tr181/hosts.c index 4545ee66..c15ad873 100644 --- a/dmtree/tr181/hosts.c +++ b/dmtree/tr181/hosts.c @@ -47,7 +47,7 @@ DMLEAF tHostsHostParams[] = { /************************************************************* * INIT **************************************************************/ -inline int init_host_args(struct host_args *args, json_object *clients, char *key) +static inline int init_host_args(struct host_args *args, json_object *clients, char *key) { args->client = clients; args->key = key; diff --git a/dmtree/tr181/ip.c b/dmtree/tr181/ip.c index 4ff96feb..f44f841e 100644 --- a/dmtree/tr181/ip.c +++ b/dmtree/tr181/ip.c @@ -167,14 +167,14 @@ unsigned char get_ipv6_finform(char *refparam, struct dmctx *dmctx, void *data, /************************************************************* * INIT **************************************************************/ -inline int init_ip_args(struct ip_args *args, struct uci_section *s, char *ip_4address) +static inline int init_ip_args(struct ip_args *args, struct uci_section *s, char *ip_4address) { args->ip_sec = s; args->ip_4address = ip_4address; return 0; } -inline int init_ipv6_args(struct ipv6_args *args, struct uci_section *s, char *ip_6address, char *ip_6mask, char *ip_6preferred, char *ip_6valid) +static inline int init_ipv6_args(struct ipv6_args *args, struct uci_section *s, char *ip_6address, char *ip_6mask, char *ip_6preferred, char *ip_6valid) { args->ip_sec = s; args->ip_6address = ip_6address; @@ -184,7 +184,7 @@ inline int init_ipv6_args(struct ipv6_args *args, struct uci_section *s, char *i return 0; } -inline int init_ipv6prefix_args(struct ipv6prefix_args *args, struct uci_section *s, char *ip_6prefixaddress, char *ip_6prefixmask, char *ip_6prefixpreferred, char *ip_6prefixvalid) +static inline int init_ipv6prefix_args(struct ipv6prefix_args *args, struct uci_section *s, char *ip_6prefixaddress, char *ip_6prefixmask, char *ip_6prefixpreferred, char *ip_6prefixvalid) { args->ip_sec = s; args->ip_6prefixaddress = ip_6prefixaddress; diff --git a/dmtree/tr181/ptm.c b/dmtree/tr181/ptm.c index 5f3159d6..c825026a 100644 --- a/dmtree/tr181/ptm.c +++ b/dmtree/tr181/ptm.c @@ -62,7 +62,7 @@ int get_ptm_linker(char *refparam, struct dmctx *dmctx, void *data, char *instan /************************************************************************** * INIT ***************************************************************************/ -inline int init_ptm_link(struct ptm_args *args, struct uci_section *s, char *ifname) +static inline int init_ptm_link(struct ptm_args *args, struct uci_section *s, char *ifname) { args->ptm_sec = s; args->ifname = ifname; diff --git a/dmtree/tr181/routing.c b/dmtree/tr181/routing.c index cf7888c2..46886100 100644 --- a/dmtree/tr181/routing.c +++ b/dmtree/tr181/routing.c @@ -105,7 +105,7 @@ DMLEAF tRoutingRouteInformationInterfaceSettingParams[] = { /******************************** * init function ********************************/ -inline int init_args_ipv4forward(struct routingfwdargs *args, struct uci_section *s, char *permission, int type) +static inline int init_args_ipv4forward(struct routingfwdargs *args, struct uci_section *s, char *permission, int type) { args->permission = permission; args->routefwdsection = s; @@ -113,7 +113,7 @@ inline int init_args_ipv4forward(struct routingfwdargs *args, struct uci_section return 0; } -inline int init_args_ipv6forward(struct routingfwdargs *args, struct uci_section *s, char *permission, int type) +static inline int init_args_ipv6forward(struct routingfwdargs *args, struct uci_section *s, char *permission, int type) { args->permission = permission; args->routefwdsection = s; diff --git a/dmtree/tr181/wifi.c b/dmtree/tr181/wifi.c index c442efb0..f9df1b80 100644 --- a/dmtree/tr181/wifi.c +++ b/dmtree/tr181/wifi.c @@ -387,13 +387,13 @@ int get_linker_associated_device(char *refparam, struct dmctx *dmctx, void *data /************************************************************************** * INIT ***************************************************************************/ -inline int init_wifi_radio(struct wifi_radio_args *args, struct uci_section *s) +static inline int init_wifi_radio(struct wifi_radio_args *args, struct uci_section *s) { args->wifi_radio_sec = s; return 0; } -inline int init_wifi_ssid(struct wifi_ssid_args *args, struct uci_section *s, char *wiface, char *linker) +static inline int init_wifi_ssid(struct wifi_ssid_args *args, struct uci_section *s, char *wiface, char *linker) { args->wifi_ssid_sec = s; args->ifname = wiface; @@ -401,14 +401,14 @@ inline int init_wifi_ssid(struct wifi_ssid_args *args, struct uci_section *s, ch return 0; } -inline int init_wifi_acp(struct wifi_acp_args *args, struct uci_section *s, char *wiface) +static inline int init_wifi_acp(struct wifi_acp_args *args, struct uci_section *s, char *wiface) { args->wifi_acp_sec = s; args->ifname = wiface; return 0; } -inline int init_wifi_enp(struct wifi_enp_args *args, struct uci_section *s, char *wiface) +static inline int init_wifi_enp(struct wifi_enp_args *args, struct uci_section *s, char *wiface) { args->wifi_enp_sec = s; args->ifname = wiface;