From a05e7e7f23667603f1d58b58c92623a6d701607d Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 7 Mar 2013 18:13:40 +0200 Subject: [PATCH] provider: Change the name of provider remove function Following patch will introduce provider remove function that can be used from vpn plugin so rename the current removal function to reflect better its usage. --- src/connman.h | 2 +- src/manager.c | 2 +- src/provider.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/connman.h b/src/connman.h index fc6d528..19bca74 100644 --- a/src/connman.h +++ b/src/connman.h @@ -559,7 +559,7 @@ int __connman_provider_indicate_state(struct connman_provider *provider, int __connman_provider_indicate_error(struct connman_provider *provider, enum connman_provider_error error); int __connman_provider_connect(struct connman_provider *provider); -int __connman_provider_remove(const char *path); +int __connman_provider_remove_by_path(const char *path); void __connman_provider_cleanup(void); int __connman_provider_init(void); diff --git a/src/manager.c b/src/manager.c index 1d09267..e56f2e1 100644 --- a/src/manager.c +++ b/src/manager.c @@ -161,7 +161,7 @@ static DBusMessage *remove_provider(DBusConnection *conn, dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); - err = __connman_provider_remove(path); + err = __connman_provider_remove_by_path(path); if (err < 0) return __connman_error_failed(msg, -err); diff --git a/src/provider.c b/src/provider.c index ca86880..b86e7d6 100644 --- a/src/provider.c +++ b/src/provider.c @@ -174,7 +174,7 @@ int __connman_provider_connect(struct connman_provider *provider) return 0; } -int __connman_provider_remove(const char *path) +int __connman_provider_remove_by_path(const char *path) { struct connman_provider *provider; GHashTableIter iter; -- 2.7.4