[PATCH obexd 2/8] client: move __obex_log_init before manager_init

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>

This enables us to log target during initialization
---
 client/main.c    |    4 ++--
 client/manager.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/main.c b/client/main.c
index 618ad21..80f9413 100644
--- a/client/main.c
+++ b/client/main.c
@@ -87,11 +87,11 @@ int main(int argc, char *argv[])
 
 	event_loop = g_main_loop_new(NULL, FALSE);
 
+	__obex_log_init("obex-client", option_debug, !option_stderr);
+
 	if (manager_init() < 0)
 		exit(EXIT_FAILURE);
 
-	__obex_log_init("obex-client", option_debug, !option_stderr);
-
 	DBG("Entering main loop");
 
 	memset(&sa, 0, sizeof(sa));
diff --git a/client/manager.c b/client/manager.c
index b13dd78..a272a87 100644
--- a/client/manager.c
+++ b/client/manager.c
@@ -571,7 +571,7 @@ int manager_init(void)
 
 	conn = g_dbus_setup_bus(DBUS_BUS_SESSION, CLIENT_SERVICE, &derr);
 	if (dbus_error_is_set(&derr) == TRUE) {
-		g_printerr("%s: %s\n", derr.name, derr.message);
+		error("%s: %s", derr.name, derr.message);
 		dbus_error_free(&derr);
 		return -1;
 	}
@@ -579,7 +579,7 @@ int manager_init(void)
 	if (g_dbus_register_interface(conn, CLIENT_PATH, CLIENT_INTERFACE,
 						client_methods, NULL, NULL,
 							NULL, NULL) == FALSE) {
-		g_printerr("Can't register client interface\n");
+		error("Can't register client interface");
 		dbus_connection_unref(conn);
 		conn = NULL;
 		return -1;
-- 
1.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux