From 8a799e2f997681425e96247cb0908e2c214a9466 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 13 Jan 2012 17:39:08 +0100 Subject: ipconfig: Rename previously public functions Prefix them with a "__". --- src/6to4.c | 2 +- src/connman.h | 18 +++++++++--------- src/dhcp.c | 4 ++-- src/ipconfig.c | 42 ++++++++++++++++++++-------------------- src/network.c | 6 +++--- src/provider.c | 4 ++-- src/service.c | 60 +++++++++++++++++++++++++++++----------------------------- 7 files changed, 68 insertions(+), 68 deletions(-) (limited to 'src') diff --git a/src/6to4.c b/src/6to4.c index 7712ea3a..2d54f6d9 100644 --- a/src/6to4.c +++ b/src/6to4.c @@ -514,7 +514,7 @@ int __connman_6to4_probe(struct connman_service *service) (a == 172 && (b >= 16 && b <= 31))) return -1; - index = connman_ipconfig_get_index(ip4config); + index = __connman_ipconfig_get_index(ip4config); ip_address = g_strdup(address); tunnel_pending = 1; diff --git a/src/connman.h b/src/connman.h index 791de61b..583d90ce 100644 --- a/src/connman.h +++ b/src/connman.h @@ -187,20 +187,20 @@ struct connman_ipconfig_ops { void (*route_unset) (struct connman_ipconfig *ipconfig); }; -struct connman_ipconfig *connman_ipconfig_create(int index, +struct connman_ipconfig *__connman_ipconfig_create(int index, enum connman_ipconfig_type type); -struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig); -void connman_ipconfig_unref(struct connman_ipconfig *ipconfig); +struct connman_ipconfig *__connman_ipconfig_ref(struct connman_ipconfig *ipconfig); +void __connman_ipconfig_unref(struct connman_ipconfig *ipconfig); -void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig); -void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data); +void *__connman_ipconfig_get_data(struct connman_ipconfig *ipconfig); +void __connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data); -int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig); -const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig); +int __connman_ipconfig_get_index(struct connman_ipconfig *ipconfig); +const char *__connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig); -void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, +void __connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, const struct connman_ipconfig_ops *ops); -int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, +int __connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, enum connman_ipconfig_method method); void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig); void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig); diff --git a/src/dhcp.c b/src/dhcp.c index a6263bd1..3f3382d3 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -263,7 +263,7 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) if (option != NULL) pac = g_strdup(option->data); - connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); if (ip_change == TRUE) { __connman_ipconfig_set_local(ipconfig, address); @@ -354,7 +354,7 @@ static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data) prefixlen = __connman_ipconfig_netmask_prefix_len(netmask); - connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); __connman_ipconfig_set_local(ipconfig, address); __connman_ipconfig_set_prefixlen(ipconfig, prefixlen); __connman_ipconfig_set_gateway(ipconfig, NULL); diff --git a/src/ipconfig.c b/src/ipconfig.c index ba76f761..3429d1b8 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -522,12 +522,12 @@ static void free_ipdevice(gpointer data) ipdevice->index); if (ipdevice->config_ipv4 != NULL) { - connman_ipconfig_unref(ipdevice->config_ipv4); + __connman_ipconfig_unref(ipdevice->config_ipv4); ipdevice->config_ipv4 = NULL; } if (ipdevice->config_ipv6 != NULL) { - connman_ipconfig_unref(ipdevice->config_ipv6); + __connman_ipconfig_unref(ipdevice->config_ipv6); ipdevice->config_ipv6 = NULL; } @@ -583,9 +583,9 @@ static void update_stats(struct connman_ipdevice *ipdevice, return; if (ipdevice->config_ipv4) - service = connman_ipconfig_get_data(ipdevice->config_ipv4); + service = __connman_ipconfig_get_data(ipdevice->config_ipv4); else if (ipdevice->config_ipv6) - service = connman_ipconfig_get_data(ipdevice->config_ipv6); + service = __connman_ipconfig_get_data(ipdevice->config_ipv6); else return; @@ -1258,7 +1258,7 @@ static struct connman_ipconfig *create_ipv6config(int index) * * Returns: a newly-allocated #connman_ipconfig structure */ -struct connman_ipconfig *connman_ipconfig_create(int index, +struct connman_ipconfig *__connman_ipconfig_create(int index, enum connman_ipconfig_type type) { struct connman_ipconfig *ipconfig; @@ -1297,7 +1297,7 @@ struct connman_ipconfig *connman_ipconfig_create(int index, * * Increase reference counter of ipconfig */ -struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig) +struct connman_ipconfig *__connman_ipconfig_ref(struct connman_ipconfig *ipconfig) { DBG("ipconfig %p refcount %d", ipconfig, ipconfig->refcount + 1); @@ -1312,7 +1312,7 @@ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig) * * Decrease reference counter of ipconfig */ -void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) +void __connman_ipconfig_unref(struct connman_ipconfig *ipconfig) { if (ipconfig == NULL) return; @@ -1325,10 +1325,10 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) if (__connman_ipconfig_disable(ipconfig) < 0) ipconfig_list = g_list_remove(ipconfig_list, ipconfig); - connman_ipconfig_set_ops(ipconfig, NULL); + __connman_ipconfig_set_ops(ipconfig, NULL); if (ipconfig->origin != NULL) { - connman_ipconfig_unref(ipconfig->origin); + __connman_ipconfig_unref(ipconfig->origin); ipconfig->origin = NULL; } @@ -1344,7 +1344,7 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) * * Get private data pointer */ -void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig) +void *__connman_ipconfig_get_data(struct connman_ipconfig *ipconfig) { if (ipconfig == NULL) return NULL; @@ -1359,7 +1359,7 @@ void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig) * * Set private data pointer */ -void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data) +void __connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data) { ipconfig->ops_data = data; } @@ -1370,7 +1370,7 @@ void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data) * * Get interface index */ -int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig) +int __connman_ipconfig_get_index(struct connman_ipconfig *ipconfig) { if (ipconfig == NULL) return -1; @@ -1387,7 +1387,7 @@ int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig) * * Get interface name */ -const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig) +const char *__connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig) { struct connman_ipdevice *ipdevice; @@ -1412,7 +1412,7 @@ const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig) * * Set the operation callbacks */ -void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, +void __connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, const struct connman_ipconfig_ops *ops) { ipconfig->ops = ops; @@ -1425,7 +1425,7 @@ void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, * * Set the configuration method */ -int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, +int __connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, enum connman_ipconfig_method method) { ipconfig->method = method; @@ -1668,7 +1668,7 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) connman_ipaddress_clear(ipdevice->config_ipv4->system); - connman_ipconfig_unref(ipdevice->config_ipv4); + __connman_ipconfig_unref(ipdevice->config_ipv4); } if (type == CONNMAN_IPCONFIG_TYPE_IPV6 && @@ -1678,13 +1678,13 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) connman_ipaddress_clear(ipdevice->config_ipv6->system); - connman_ipconfig_unref(ipdevice->config_ipv6); + __connman_ipconfig_unref(ipdevice->config_ipv6); } if (type == CONNMAN_IPCONFIG_TYPE_IPV4) - ipdevice->config_ipv4 = connman_ipconfig_ref(ipconfig); + ipdevice->config_ipv4 = __connman_ipconfig_ref(ipconfig); else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) - ipdevice->config_ipv6 = connman_ipconfig_ref(ipconfig); + ipdevice->config_ipv6 = __connman_ipconfig_ref(ipconfig); ipconfig_list = g_list_append(ipconfig_list, ipconfig); @@ -1733,7 +1733,7 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) ipconfig_list = g_list_remove(ipconfig_list, ipconfig); connman_ipaddress_clear(ipdevice->config_ipv4->system); - connman_ipconfig_unref(ipdevice->config_ipv4); + __connman_ipconfig_unref(ipdevice->config_ipv4); ipdevice->config_ipv4 = NULL; return 0; } @@ -1746,7 +1746,7 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) disable_ipv6(ipdevice->config_ipv6); connman_ipaddress_clear(ipdevice->config_ipv6->system); - connman_ipconfig_unref(ipdevice->config_ipv6); + __connman_ipconfig_unref(ipdevice->config_ipv6); ipdevice->config_ipv6 = NULL; return 0; } diff --git a/src/network.c b/src/network.c index 764fd966..d054f344 100644 --- a/src/network.c +++ b/src/network.c @@ -704,7 +704,7 @@ void connman_network_set_ipv4_method(struct connman_network *network, if (ipconfig == NULL) return; - connman_ipconfig_set_method(ipconfig, method); + __connman_ipconfig_set_method(ipconfig, method); } void connman_network_set_ipv6_method(struct connman_network *network, @@ -721,7 +721,7 @@ void connman_network_set_ipv6_method(struct connman_network *network, if (ipconfig == NULL) return; - connman_ipconfig_set_method(ipconfig, method); + __connman_ipconfig_set_method(ipconfig, method); } void connman_network_set_error(struct connman_network *network, @@ -1132,7 +1132,7 @@ static void autoconf_ipv6_set(struct connman_network *network) if (ipconfig == NULL) return; - index = connman_ipconfig_get_index(ipconfig); + index = __connman_ipconfig_get_index(ipconfig); connman_network_ref(network); diff --git a/src/provider.c b/src/provider.c index 1ff6bc43..92158e2c 100644 --- a/src/provider.c +++ b/src/provider.c @@ -752,7 +752,7 @@ void connman_provider_set_index(struct connman_provider *provider, int index) } } - connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_FIXED); + __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_FIXED); __connman_ipconfig_set_index(ipconfig, index); @@ -768,7 +768,7 @@ void connman_provider_set_index(struct connman_provider *provider, int index) } } - connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_OFF); + __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_OFF); __connman_ipconfig_set_index(ipconfig, index); done: diff --git a/src/service.c b/src/service.c index 485104a7..109c8b69 100644 --- a/src/service.c +++ b/src/service.c @@ -811,9 +811,9 @@ static void update_nameservers(struct connman_service *service) const char *ifname; if (service->ipconfig_ipv4) - ifname = connman_ipconfig_get_ifname(service->ipconfig_ipv4); + ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv4); else if (service->ipconfig_ipv6) - ifname = connman_ipconfig_get_ifname(service->ipconfig_ipv6); + ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv6); else ifname = NULL; @@ -3395,16 +3395,16 @@ static void service_free(gpointer user_data) connman_provider_unref(service->provider); if (service->ipconfig_ipv4 != NULL) { - connman_ipconfig_set_ops(service->ipconfig_ipv4, NULL); - connman_ipconfig_set_data(service->ipconfig_ipv4, NULL); - connman_ipconfig_unref(service->ipconfig_ipv4); + __connman_ipconfig_set_ops(service->ipconfig_ipv4, NULL); + __connman_ipconfig_set_data(service->ipconfig_ipv4, NULL); + __connman_ipconfig_unref(service->ipconfig_ipv4); service->ipconfig_ipv4 = NULL; } if (service->ipconfig_ipv6 != NULL) { - connman_ipconfig_set_ops(service->ipconfig_ipv6, NULL); - connman_ipconfig_set_data(service->ipconfig_ipv6, NULL); - connman_ipconfig_unref(service->ipconfig_ipv6); + __connman_ipconfig_set_ops(service->ipconfig_ipv6, NULL); + __connman_ipconfig_set_data(service->ipconfig_ipv6, NULL); + __connman_ipconfig_unref(service->ipconfig_ipv6); service->ipconfig_ipv6 = NULL; } @@ -3678,10 +3678,10 @@ char *connman_service_get_interface(struct connman_service *service) if (service->type == CONNMAN_SERVICE_TYPE_VPN) { if (service->ipconfig_ipv4) - index = connman_ipconfig_get_index( + index = __connman_ipconfig_get_index( service->ipconfig_ipv4); else if (service->ipconfig_ipv6) - index = connman_ipconfig_get_index( + index = __connman_ipconfig_get_index( service->ipconfig_ipv6); else return NULL; @@ -4812,9 +4812,9 @@ static int service_register(struct connman_service *service) static void service_up(struct connman_ipconfig *ipconfig) { - struct connman_service *service = connman_ipconfig_get_data(ipconfig); + struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s up", connman_ipconfig_get_ifname(ipconfig)); + DBG("%s up", __connman_ipconfig_get_ifname(ipconfig)); link_changed(service); @@ -4824,23 +4824,23 @@ static void service_up(struct connman_ipconfig *ipconfig) static void service_down(struct connman_ipconfig *ipconfig) { - DBG("%s down", connman_ipconfig_get_ifname(ipconfig)); + DBG("%s down", __connman_ipconfig_get_ifname(ipconfig)); } static void service_lower_up(struct connman_ipconfig *ipconfig) { - struct connman_service *service = connman_ipconfig_get_data(ipconfig); + struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s lower up", connman_ipconfig_get_ifname(ipconfig)); + DBG("%s lower up", __connman_ipconfig_get_ifname(ipconfig)); stats_start(service); } static void service_lower_down(struct connman_ipconfig *ipconfig) { - struct connman_service *service = connman_ipconfig_get_data(ipconfig); + struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s lower down", connman_ipconfig_get_ifname(ipconfig)); + DBG("%s lower down", __connman_ipconfig_get_ifname(ipconfig)); stats_stop(service); service_save(service); @@ -4848,11 +4848,11 @@ static void service_lower_down(struct connman_ipconfig *ipconfig) static void service_ip_bound(struct connman_ipconfig *ipconfig) { - struct connman_service *service = connman_ipconfig_get_data(ipconfig); + struct connman_service *service = __connman_ipconfig_get_data(ipconfig); enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN; - DBG("%s ip bound", connman_ipconfig_get_ifname(ipconfig)); + DBG("%s ip bound", __connman_ipconfig_get_ifname(ipconfig)); type = __connman_ipconfig_get_config_type(ipconfig); method = __connman_ipconfig_get_method(ipconfig); @@ -4871,11 +4871,11 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig) static void service_ip_release(struct connman_ipconfig *ipconfig) { - struct connman_service *service = connman_ipconfig_get_data(ipconfig); + struct connman_service *service = __connman_ipconfig_get_data(ipconfig); enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN; - DBG("%s ip release", connman_ipconfig_get_ifname(ipconfig)); + DBG("%s ip release", __connman_ipconfig_get_ifname(ipconfig)); type = __connman_ipconfig_get_config_type(ipconfig); method = __connman_ipconfig_get_method(ipconfig); @@ -4910,28 +4910,28 @@ static const struct connman_ipconfig_ops service_ops = { static void setup_ip4config(struct connman_service *service, int index, enum connman_ipconfig_method method) { - service->ipconfig_ipv4 = connman_ipconfig_create(index, + service->ipconfig_ipv4 = __connman_ipconfig_create(index, CONNMAN_IPCONFIG_TYPE_IPV4); if (service->ipconfig_ipv4 == NULL) return; - connman_ipconfig_set_method(service->ipconfig_ipv4, method); + __connman_ipconfig_set_method(service->ipconfig_ipv4, method); - connman_ipconfig_set_data(service->ipconfig_ipv4, service); + __connman_ipconfig_set_data(service->ipconfig_ipv4, service); - connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops); + __connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops); } static void setup_ip6config(struct connman_service *service, int index) { - service->ipconfig_ipv6 = connman_ipconfig_create(index, + service->ipconfig_ipv6 = __connman_ipconfig_create(index, CONNMAN_IPCONFIG_TYPE_IPV6); if (service->ipconfig_ipv6 == NULL) return; - connman_ipconfig_set_data(service->ipconfig_ipv6, service); + __connman_ipconfig_set_data(service->ipconfig_ipv6, service); - connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops); + __connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops); } void __connman_service_read_ip4config(struct connman_service *service) @@ -5036,11 +5036,11 @@ struct connman_service *__connman_service_lookup_from_index(int index) while (g_sequence_iter_is_end(iter) == FALSE) { service = g_sequence_get(iter); - if (connman_ipconfig_get_index(service->ipconfig_ipv4) + if (__connman_ipconfig_get_index(service->ipconfig_ipv4) == index) return service; - if (connman_ipconfig_get_index(service->ipconfig_ipv6) + if (__connman_ipconfig_get_index(service->ipconfig_ipv6) == index) return service; -- cgit v1.2.3