From 9769f7c73888b577ad0c0398a80741cfc03dd4dd Mon Sep 17 00:00:00 2001 From: Pekka Pessi Date: Thu, 26 Aug 2010 17:26:49 +0300 Subject: device: add connman_device_get_ident() Expose former core function __connman_device_get_ident(). --- include/device.h | 1 + src/connman.h | 1 - src/device.c | 2 +- src/network.c | 2 +- src/service.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/device.h b/include/device.h index b4bb2973..a5ed412e 100644 --- a/include/device.h +++ b/include/device.h @@ -70,6 +70,7 @@ const char *connman_device_get_control(struct connman_device *device); void connman_device_set_ident(struct connman_device *device, const char *ident); +const char *connman_device_get_ident(struct connman_device *device); void connman_device_set_mode(struct connman_device *device, enum connman_device_mode mode); diff --git a/src/connman.h b/src/connman.h index 74f57460..0d2d65ea 100644 --- a/src/connman.h +++ b/src/connman.h @@ -357,7 +357,6 @@ void __connman_device_set_reconnect(struct connman_device *device, connman_bool_t __connman_device_get_reconnect(struct connman_device *device); const char *__connman_device_get_type(struct connman_device *device); -const char *__connman_device_get_ident(struct connman_device *device); int __connman_device_set_offlinemode(connman_bool_t offlinemode); diff --git a/src/device.c b/src/device.c index 3ee6925e..53d9a662 100644 --- a/src/device.c +++ b/src/device.c @@ -950,7 +950,7 @@ void connman_device_set_ident(struct connman_device *device, device->ident = g_strdup(ident); } -const char *__connman_device_get_ident(struct connman_device *device) +const char *connman_device_get_ident(struct connman_device *device) { return device->ident; } diff --git a/src/network.c b/src/network.c index 509fb42d..820ce99a 100644 --- a/src/network.c +++ b/src/network.c @@ -564,7 +564,7 @@ const char *__connman_network_get_ident(struct connman_network *network) if (network->device == NULL) return NULL; - return __connman_device_get_ident(network->device); + return connman_device_get_ident(network->device); } connman_bool_t __connman_network_get_weakness(struct connman_network *network) diff --git a/src/service.c b/src/service.c index 8ea721b5..c14fdc39 100644 --- a/src/service.c +++ b/src/service.c @@ -3003,7 +3003,7 @@ int __connman_service_create_and_connect(DBusMessage *msg) if (device == NULL) return -EOPNOTSUPP; - ident = __connman_device_get_ident(device); + ident = connman_device_get_ident(device); if (ident == NULL) return -EOPNOTSUPP; -- cgit v1.2.3