From 6934437fc7799e123cd46bd821b3a73e823d2702 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 18 Dec 2012 16:03:40 +0200 Subject: [PATCH] obexd: Add client prefix to client manager functions This is in preparation of merging the client into the daemon. --- obexd/client/main.c | 4 ++-- obexd/client/manager.c | 4 ++-- obexd/client/manager.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/obexd/client/main.c b/obexd/client/main.c index e0e2eb545..255ee37d0 100644 --- a/obexd/client/main.c +++ b/obexd/client/main.c @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) __obex_log_init("obex-client", option_debug, !option_stderr); - if (manager_init() < 0) + if (client_manager_init() < 0) exit(EXIT_FAILURE); DBG("Entering main loop"); @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) g_source_remove(signal); - manager_exit(); + client_manager_exit(); g_main_loop_unref(event_loop); diff --git a/obexd/client/manager.c b/obexd/client/manager.c index 4929383ae..8f367d6f6 100644 --- a/obexd/client/manager.c +++ b/obexd/client/manager.c @@ -255,7 +255,7 @@ static struct obc_module { { } }; -int manager_init(void) +int client_manager_init(void) { DBusError derr; struct obc_module *module; @@ -290,7 +290,7 @@ int manager_init(void) return 0; } -void manager_exit(void) +void client_manager_exit(void) { struct obc_module *module; diff --git a/obexd/client/manager.h b/obexd/client/manager.h index 875698261..e4068de44 100644 --- a/obexd/client/manager.h +++ b/obexd/client/manager.h @@ -21,5 +21,5 @@ * */ -int manager_init(void); -void manager_exit(void); +int client_manager_init(void); +void client_manager_exit(void); -- 2.47.3