Remove unnecessary iteration for joiner start 08/272908/1
authorhyunuk.tak <hyunuk.tak@samsung.com>
Fri, 25 Mar 2022 07:18:03 +0000 (16:18 +0900)
committerhyunuk.tak <hyunuk.tak@samsung.com>
Mon, 28 Mar 2022 01:58:21 +0000 (10:58 +0900)
Change-Id: Ifdf04d208ea5a8e9504bc42395d02701ecc395a9
Signed-off-by: hyunuk.tak <hyunuk.tak@samsung.com>
src/thread-util.c

index 81e96bb4c25685b1376cc0d5a3131be17298918e..31a198a36d1148ea8a85c790cb6bd49bb5112224 100644 (file)
@@ -102,7 +102,6 @@ int  __thread_dbus_handle_joiner_start_cb(gboolean res, GVariant *val, gpointer
 {
        FUNC_ENTRY;
        int ret = THREAD_ERROR_NONE;
-       GVariantIter *iter;
        char *pskd = NULL;
        char *prov_url = NULL;
        char *vendor_name = NULL;
@@ -118,26 +117,16 @@ int  __thread_dbus_handle_joiner_start_cb(gboolean res, GVariant *val, gpointer
                goto end;
        }
 
-       g_variant_get(val, "(ssssss)", &iter);
-
-       while (g_variant_iter_loop(iter, "(&s&s&s&s&s&s)",
-               &pskd, &prov_url, &vendor_name, &vendor_model,
-               &vendor_sw_ver, &vendor_data)) {
-
-               THREAD_DBG("Got the thread beacon...");
-               THREAD_DBG("pskd: %s", pskd);
+       g_variant_get(val, "(ssssss)", &pskd, &prov_url, &vendor_name,
+               &vendor_model, &vendor_sw_ver, &vendor_data);
 
-               THREAD_DBG("pskd: %s", pskd);
-               THREAD_DBG("prov_url: %s", prov_url);
-               THREAD_DBG("vendor_name: %s", vendor_name);
-               THREAD_DBG("vendor_model: %s", vendor_model);
-               THREAD_DBG("vendor_sw_ver: %s", vendor_sw_ver);
-               THREAD_DBG("vendor_data: %s", vendor_data);
-
-               if (cb_data && cb_data->callback)
-                       ((thread_joiner_result_cb)(cb_data->callback))(res, user_data);
-       }
-       g_variant_iter_free(iter);
+       THREAD_DBG("Got the thread beacon...");
+       THREAD_DBG("pskd: %s", pskd);
+       THREAD_DBG("prov_url: %s", prov_url);
+       THREAD_DBG("vendor_name: %s", vendor_name);
+       THREAD_DBG("vendor_model: %s", vendor_model);
+       THREAD_DBG("vendor_sw_ver: %s", vendor_sw_ver);
+       THREAD_DBG("vendor_data: %s", vendor_data);
 
 end:
        if (cb_data && cb_data->callback)