From 1caf45477d361a446b8660a7653a1c0189903439 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Tue, 17 Sep 2013 14:01:47 -0700 Subject: [PATCH] Fixed compilation warnings Signed-off-by: Jimmy Huang --- dialer/main.c | 19 ++++++++++++------- utils/amb.c | 3 --- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dialer/main.c b/dialer/main.c index bf82e49..a8cc274 100644 --- a/dialer/main.c +++ b/dialer/main.c @@ -97,6 +97,9 @@ static int _terminate(void *data __UNUSED__) EAPI int elm_main(int argc, char **argv) { +#ifdef HAVE_TIZEN + int iReturn = 0; +#endif int args; char *modem_path = NULL; char *modem_api = NULL; @@ -213,26 +216,29 @@ EAPI int elm_main(int argc, char **argv) if (!amb_init()) { CRITICAL("Could not setup automotive-message-broker"); _app_exit_code = EXIT_FAILURE; - goto end_amb; + goto end_util; } #endif if (!pa_init()) { CRITICAL("Could not setup pulseaudio"); _app_exit_code = EXIT_FAILURE; - goto end_pulseaudio; +#ifdef HAVE_TIZEN + goto end_amb; +#else + goto end_util; +#endif } if (!gui_init()) { CRITICAL("Could not setup graphical user interface"); _app_exit_code = EXIT_FAILURE; - goto end_util; + goto end_pulseaudio; } INF("Entering main loop"); #ifdef HAVE_TIZEN - int iReturn = 0; struct appcore_ops ops = { .create = _create, .resume = _resume, @@ -248,15 +254,14 @@ EAPI int elm_main(int argc, char **argv) INF("Quit main loop"); gui_shutdown(); - -end_util: - util_shutdown(); end_pulseaudio: pa_shutdown(); #ifdef HAVE_TIZEN end_amb: amb_shutdown(); #endif +end_util: + util_shutdown(); end_ofono: ofono_shutdown(); end_rc: diff --git a/utils/amb.c b/utils/amb.c index 6e15048..82df582 100644 --- a/utils/amb.c +++ b/utils/amb.c @@ -203,7 +203,6 @@ static void _amb_free(AMB_Manager *m) static void _amb_properties_changed(void *data __UNUSED__, DBusMessage *msg) { - const char *path; AMB_Manager *m = _amb_get(); DBusMessageIter iter, value; const char *interface; @@ -213,8 +212,6 @@ static void _amb_properties_changed(void *data __UNUSED__, DBusMessage *msg) return; } - path = dbus_message_get_path(msg); - dbus_message_iter_get_basic(&iter, &interface); dbus_message_iter_next(&iter); dbus_message_iter_recurse(&iter, &value); -- 2.7.4