Fix gcov build error

[platform/core/connectivity/bluetooth-agent.git] / pb-agent / bluetooth_pb_agent.c

diff --git a/pb-agent/bluetooth_pb_agent.c b/pb-agent/bluetooth_pb_agent.c
index 1a3b7c9..5daecde 100644 (file)
--- a/pb-agent/bluetooth_pb_agent.c
+++ b/pb-agent/bluetooth_pb_agent.c
@@ -139,6 +139,7 @@ static const gchar pb_agent_introspection_xml[] =
        "</interface>"
 "</node>";
 
+/* LCOV_EXCL_START */
 static void __bt_pb_agent_method(GDBusConnection *connection,
                        const gchar *sender, const gchar *object_path,
                        const gchar *interface_name, const gchar *method_name,
@@ -478,10 +479,10 @@ static GVariant *__bt_pb_get_phonebook(PbAgentData *agent, const char *name,
        FN_START;
        GVariant *phonebook;
        PhoneBookType pb_type = TELECOM_NONE;
-       GVariantBuilder *vcards = g_variant_builder_new(G_VARIANT_TYPE("as"));
+       GVariantBuilder *vcards;
 
        INFO("name: %s filter: %lld format: %d max_list_count: %d list_start_offset: %d\n",
-                       name, filter, format, max_list_count, list_start_offset);
+                       name, (unsigned long long int)filter, format, max_list_count, list_start_offset);
 
        __bluetooth_pb_agent_timeout_add_seconds(agent);
 
@@ -493,6 +494,8 @@ static GVariant *__bt_pb_get_phonebook(PbAgentData *agent, const char *name,
                return NULL;
        }
 
+       vcards = g_variant_builder_new(G_VARIANT_TYPE("as"));
+
        if (max_list_count > 0) {
                __bluetooth_pb_get_vcards(agent, pb_type, filter, format,
                                max_list_count, list_start_offset, vcards);
@@ -564,7 +567,7 @@ static GVariant *__bt_pb_get_phonebook_list(PbAgentData *agent,
        GVariant *phonebook_list;
        PhoneBookType pb_type = TELECOM_NONE;
 
-       GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssu)"));
+       GVariantBuilder *builder;
 
        DBG_SECURE("name: %s\n", name);
 
@@ -578,6 +581,8 @@ static GVariant *__bt_pb_get_phonebook_list(PbAgentData *agent,
                return NULL;
        }
 
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssu)"));
+
        __bluetooth_pb_get_list(agent, pb_type, builder);
 
        INFO("pb_type[%d] / number of missed_call[%d]", pb_type,
@@ -593,8 +598,7 @@ static GVariant *__bt_pb_get_phonebook_list(PbAgentData *agent,
                phonebook_list = g_variant_new("(a(ssu)u)", builder, 0);
        }
 
-       if (builder)
-               g_variant_builder_unref(builder);
+       g_variant_builder_unref(builder);
 
        FN_END;
        return phonebook_list;
@@ -611,8 +615,8 @@ static GVariant *__bt_pb_get_phonebook_entry(PbAgentData *agent,
        gchar *str = NULL;
        const gchar *attr = NULL;
 
-       DBG_SECURE("folder: %s id: %s filter: %ld format: %d\n",
-                       folder, id, filter, format);
+       DBG_SECURE("folder: %s id: %s filter: %llu format: %d\n",
+                       folder, id, (unsigned long long int)filter, format);
 
        __bluetooth_pb_agent_timeout_add_seconds(agent);
 
@@ -732,7 +736,7 @@ static GVariant *__bt_pb_get_phonebook_entries_at(PbAgentData *agent,
        FN_START;
        GVariant *phonebook_entries;
        PhoneBookType pb_type = TELECOM_NONE;
-       GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssu)"));
+       GVariantBuilder *builder;
 
        DBG("command: %s, start_index: %d, end_index: %d\n",
                        command, start_index, end_index);
@@ -747,12 +751,13 @@ static GVariant *__bt_pb_get_phonebook_entries_at(PbAgentData *agent,
                return NULL;
        }
 
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssu)"));
+
        __bluetooth_pb_get_list_number(agent, pb_type,
                        start_index, end_index, builder);
 
        phonebook_entries = g_variant_new("(a(ssu))", builder);
-       if (builder)
-               g_variant_builder_unref(builder);
+       g_variant_builder_unref(builder);
 
        FN_END;
        return phonebook_entries;
@@ -765,7 +770,7 @@ static GVariant *__bt_pb_get_phonebook_entries_find_at(PbAgentData *agent,
        FN_START;
        GVariant *phonebook_entries;
        PhoneBookType pb_type = TELECOM_NONE;
-       GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssu)"));
+       GVariantBuilder *builder;
 
        DBG("command: %s, find text: %s\n", command, find_text);
 
@@ -779,12 +784,13 @@ static GVariant *__bt_pb_get_phonebook_entries_find_at(PbAgentData *agent,
                return NULL;
        }
 
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssu)"));
+
        __bluetooth_pb_get_list_name(agent, pb_type, find_text, builder);
 
        phonebook_entries = g_variant_new("(a(ssu))", builder);
 
-       if (builder)
-               g_variant_builder_unref(builder);
+       g_variant_builder_unref(builder);
 
        FN_END;
        return phonebook_entries;
@@ -931,9 +937,8 @@ static gboolean __bt_pb_add_contact(PbAgentData *agent, const char *filename,
                        }
                }
 
-               if (is_duplicated == FALSE) {
+               if (is_duplicated == FALSE)
                        contacts_svc_insert_contact(0, contact_record);
-               }
        } else {
                ERR("Fail \n");
        }
@@ -1177,6 +1182,13 @@ next:
 
        contacts_list_destroy(recordList, true);
 
+       if (is_first_condition) {
+               ERR("ADDRESSBOOK NOT FOUND");
+               contacts_filter_destroy(filter);
+               contacts_query_destroy(query);
+               return NULL;
+       }
+
        status = contacts_query_set_filter(query, filter);
        if (status != CONTACTS_ERROR_NONE)
                ERR("Could not Apply Filter");
@@ -1464,6 +1476,10 @@ static void __bluetooth_pb_get_vcards(PbAgentData *agent, PhoneBookType pb_type,
        }
        INFO("Limit is = %d and offset is =%d\n", limit, offset);
 
+       if (query == NULL) {
+               ERR("Query is NULL");
+               return;
+       }
        /* When limit is passed as ZERO to contacts_db_get_records_with_query
         * API then this API will provide all available contacts in its database
         * (unrestricted). Now consider a case when client requests for
@@ -1550,6 +1566,11 @@ static void __bluetooth_pb_get_contact_list(PbAgentData *agent,
                g_free(name);
        }
 
+       if (query == NULL) {
+               ERR("Query is NULL");
+               return;
+       }
+
        status = contacts_db_get_records_with_query(query, -1, -1,
                                                                &record_list);
 
@@ -1866,7 +1887,7 @@ static void __bluetooth_pb_get_list_number(PbAgentData *agent,
        DBG("type = %d", pb_type);
        switch (pb_type) {
        case TELECOM_PB:
-               query = __bluetooth_pb_query_person_number();
+               query = __bluetooth_pb_query_person(PBAP_ADDRESSBOOK_PHONE);
                __bluetooth_pb_get_contact_list_number(agent, query,
                                start_index, end_index, builder);
                break;
@@ -2101,7 +2122,7 @@ static void __bluetooth_pb_contact_changed(const gchar *view_uri,
 
        DBG("Received contact changed cb");
 
-       g_dbus_connection_emit_signal(conn, "org.bluez.pb_agent",
+       g_dbus_connection_emit_signal(conn, NULL,
                                "/org/bluez/pb_agent", "org.bluez.PbAgent",
                                "clear", NULL, NULL);
 
@@ -2340,9 +2361,8 @@ int main(void)
        tapi_result = tel_get_sim_msisdn(agent->tapi_handle,
                        __bluetooth_pb_tel_callback, agent);
 
-       if (tapi_result != TAPI_API_SUCCESS) {
+       if (tapi_result != TAPI_API_SUCCESS)
                __bt_pb_dbus_init(agent);
-       }
 
        __bluetooth_pb_agent_timeout_add_seconds(agent);
 
@@ -2363,7 +2383,7 @@ int main(void)
        if (contacts_disconnect() != CONTACTS_ERROR_NONE)
                ERR("contacts_disconnect failed \n");
 
-       g_dbus_connection_emit_signal(pb_dbus_conn, "org.bluez.pb_agent",
+       g_dbus_connection_emit_signal(pb_dbus_conn, NULL,
                                "/org/bluez/pb_agent", "org.bluez.PbAgent",
                                "clear", NULL, NULL);
 
@@ -2382,3 +2402,4 @@ int main(void)
        FN_END;
        return ret;
 }
+/* LCOV_EXCL_STOP */