Remove wrong dependency in the systemd service file

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-obex-server.c

diff --git a/bt-service/bt-service-obex-server.c b/bt-service/bt-service-obex-server.c
index bf726c1..4363a7e 100644 (file)
--- a/bt-service/bt-service-obex-server.c
+++ b/bt-service/bt-service-obex-server.c
@@ -259,7 +259,7 @@ static char *__bt_get_remote_device_name(const char *bdaddress)
        device_path = _bt_get_device_object_path((char *)bdaddress);
        retv_if(device_path == NULL, NULL);
 
-       conn = _bt_get_system_gconn();
+       conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, NULL);
        BT_INFO("Device_path %s", device_path);
        device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -326,7 +326,7 @@ static void __bt_get_remote_device_name_authinfo(const char *bdaddress,
        device_path = _bt_get_device_object_path((char *)bdaddress);
        ret_if(device_path == NULL);
 
-       conn = _bt_get_system_gconn();
+       conn = _bt_gdbus_get_system_gconn();
        ret_if(conn == NULL);
        BT_INFO("Device_path %s", device_path);
        device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -370,7 +370,7 @@ static void __bt_get_remote_device_name_authinfo(const char *bdaddress,
                                g_variant_unref(temp_value);
                        DBG_SECURE("Name = %s", name);
                }
-               temp_value = g_variant_lookup_value (value, "IsAliasSet", G_VARIANT_TYPE_BOOLEAN);
+               temp_value = g_variant_lookup_value(value, "IsAliasSet", G_VARIANT_TYPE_BOOLEAN);
                if (temp_value) {
                        is_alias_set = g_variant_get_boolean(temp_value);
                        g_variant_unref(temp_value);
@@ -407,7 +407,7 @@ static GDBusProxy *__bt_get_transfer_proxy(const char *transfer_path)
        GDBusProxy *proxy;
        GError *err = NULL;
 
-       conn = _bt_get_session_gconn();
+       conn = _bt_gdbus_get_session_gconn();
        retv_if(conn == NULL, NULL);
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -430,7 +430,7 @@ static GDBusProxy *__bt_get_transfer_properties_proxy(const char *transfer_path)
        GDBusConnection *conn;
        GDBusProxy *proxy;
        GError *err = NULL;
-       conn = _bt_get_session_gconn();
+       conn = _bt_gdbus_get_session_gconn();
        retv_if(conn == NULL, NULL);
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -585,13 +585,12 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
                GVariant *val;
                gsize len = 0;
                while (g_variant_iter_loop(iter, "{sv}", &key, &val)) {
-                       if (g_strcmp0(key, "Name") == 0) {
+                       if (g_strcmp0(key, "Name") == 0)
                                agent_info.auth_info->filename = g_variant_dup_string(val, &len);
-                       } else if (g_strcmp0(key, "Address") == 0) {
+                       else if (g_strcmp0(key, "Address") == 0)
                                bdaddress = g_variant_dup_string(val, &len);
-                       } else if (g_strcmp0(key, "Size") == 0) {
+                       else if (g_strcmp0(key, "Size") == 0)
                                agent_info.auth_info->file_size = g_variant_get_uint64(val);
-                       }
                }
                g_variant_iter_free(iter);
        }
@@ -606,7 +605,7 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
        memcpy(agent_info.auth_info->contact_auth_info, auth_info, 5);
 
        session_info = __bt_find_session_by_path((char *)path);
-       if(NULL == session_info) {
+       if (NULL == session_info) {
                session_info = g_malloc0(sizeof(bt_session_info_t));
                session_info->path = g_strdup(path);
                session_info->address = g_strdup(bdaddress);
@@ -623,7 +622,7 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
                return TRUE;
        }
 
-       if(session_info->authorized == FALSE) {
+       if (session_info->authorized == FALSE) {
                _bt_launch_system_popup(BT_AGENT_EVENT_EXCHANGE_REQUEST, device_name,
                                        auth_info, NULL, NULL, BT_OBEX_SERVER_AGENT_PATH);
        } else {
@@ -726,7 +725,7 @@ done:
        __bt_free_auth_info(agent_info.auth_info);
        agent_info.auth_info = NULL;
 
-       g_variant_builder_unref (builder);
+       g_variant_builder_unref(builder);
 
        _bt_send_event(BT_OPP_SERVER_EVENT,
                BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_STARTED,
@@ -823,7 +822,7 @@ void _bt_obex_transfer_completed(const char *transfer_path, gboolean success)
                _bt_send_event(BT_OPP_SERVER_EVENT,
                        BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_STARTED,
                        param);
-               g_variant_builder_unref (builder);
+               g_variant_builder_unref(builder);
        }
        param = g_variant_new("(issssstii)", result,
                                transfer_info->filename,
@@ -900,7 +899,7 @@ int _bt_register_obex_server(void)
        GError *g_error = NULL;
 
        /* Get the session bus. */
-       g_conn = _bt_get_session_gconn();
+       g_conn = _bt_gdbus_get_session_gconn();
        retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        _bt_obex_agent_new(BT_OBEX_SERVER_AGENT_PATH);
@@ -916,9 +915,8 @@ int _bt_register_obex_server(void)
                                                BT_OBEX_MANAGER,
                                                NULL, &g_error);
 
-       if (manager_proxy == NULL) {
+       if (manager_proxy == NULL)
                return BLUETOOTH_ERROR_INTERNAL;
-       }
 
        result = g_dbus_proxy_call_sync(manager_proxy, "RegisterAgent",
                                g_variant_new("(o)", BT_OBEX_SERVER_AGENT_PATH),
@@ -990,11 +988,10 @@ gboolean __bt_check_folder_path(const char *dest_path)
 char *__bt_transfer_folder_path(char *dest_path)
 {
        char *dst_path = (char *)g_malloc0(BT_OBEX_PATH_MAX_LENGTH);
-       if (g_str_has_prefix(dest_path, BT_OBEX_PATH_PREFIX)) {
+       if (g_str_has_prefix(dest_path, BT_OBEX_PATH_PREFIX))
                snprintf(dst_path, BT_OBEX_PATH_MAX_LENGTH, BT_OBEX_DEFAULT_PATH"%s", dest_path + strlen(BT_OBEX_PATH_PREFIX));
-       } else {
+       else
                snprintf(dst_path, BT_OBEX_PATH_MAX_LENGTH, "%s", dest_path);
-       }
 
        BT_INFO("obex transfed path : %s", dst_path);
        return dst_path;
@@ -1134,11 +1131,11 @@ void _bt_obex_server_reply_accept(void)
        _bt_send_event(BT_OPP_SERVER_EVENT, BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_AUTHORIZE, param);
 
        session_info = __bt_find_session_by_path(agent_info.auth_info->transfer_path);
-       if(NULL == session_info) {
+
+       if (NULL == session_info)
                BT_ERR("Couldn't get the session info from the list");
-       } else {
+       else
                session_info->authorized = TRUE;
-       }
 }
 
 int _bt_obex_server_reject_authorize(void)
@@ -1188,8 +1185,11 @@ int _bt_obex_server_set_destination_path(const char *dest_path,
        else
                server_info = agent_info.custom_server;
 
-       retv_if(server_info == NULL,
-                       BLUETOOTH_ERROR_AGENT_DOES_NOT_EXIST);
+       if (!server_info) {
+               BT_ERR("obex server info is NULL");
+               g_free(dst_path);
+               return BLUETOOTH_ERROR_AGENT_DOES_NOT_EXIST;
+       }
 
        g_free(server_info->dest_path);
        server_info->dest_path = g_strdup(dst_path);
@@ -1299,11 +1299,10 @@ int _bt_obex_server_is_activated(gboolean *activated)
 {
        BT_CHECK_PARAMETER(activated, return);
 
-       if (agent_info.custom_server) {
+       if (agent_info.custom_server)
                *activated = TRUE;
-       } else {
+       else
                *activated = FALSE;
-       }
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -1312,11 +1311,10 @@ int _bt_obex_server_check_allocation(gboolean *allocation)
 {
        BT_CHECK_PARAMETER(allocation, return);
 
-       if (agent_info.native_server || agent_info.custom_server) {
+       if (agent_info.native_server || agent_info.custom_server)
                *allocation = TRUE;
-       } else {
+       else
                *allocation = FALSE;
-       }
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -1346,11 +1344,10 @@ int _bt_obex_server_is_receiving(gboolean *receiving)
 {
        BT_CHECK_PARAMETER(receiving, return);
 
-       if (transfers == NULL || g_slist_length(transfers) == 0) {
+       if (transfers == NULL || g_slist_length(transfers) == 0)
                *receiving = FALSE;
-       } else {
+       else
                *receiving = TRUE;
-       }
 
        return BLUETOOTH_ERROR_NONE;
 }