[64bit Internal TC Fail] Change passing parameter using struct

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I58cdd2287ec9514153074e16badd6cd036e6b9a7

diff --git a/include/nfc_common.h b/include/nfc_common.h
old mode 100644 (file)
new mode 100755 (executable)
index 8c205bb..ea4712f
--- a/include/nfc_common.h
+++ b/include/nfc_common.h
@@ -146,6 +146,12 @@ typedef struct {
 }
 _nfc_context_s;
 
+typedef struct _nfc_activation_data_s
+{
+       nfc_activation_completed_cb callback;
+       void *user_data;
+} nfc_activation_data_s;
+
 extern _nfc_context_s gdbus_nfc_context;
 
 pid_t nfc_common_get_focus_app_pid();

diff --git a/src/nfc_manager.c b/src/nfc_manager.c
index 0dc71bb..bb9b023 100755 (executable)
--- a/src/nfc_manager.c
+++ b/src/nfc_manager.c
@@ -35,8 +35,7 @@ bool nfc_manager_is_supported(void)
 /* LCOV_EXCL_START */
 static void _activation_changed_cb(net_nfc_error_e result, void *user_data)
 {
-       nfc_activation_completed_cb callback;
-       void *user_param;
+       nfc_activation_data_s *data = user_data;
 
        LOG_BEGIN();
 
@@ -45,15 +44,10 @@ static void _activation_changed_cb(net_nfc_error_e result, void *user_data)
                return;
        }
 
-       g_variant_get((GVariant *)user_data,
-               "(uu)",
-               (guint *)&callback,
-               (guint *)&user_param);
+       if (data->callback != NULL)
+               data->callback(nfc_common_convert_error_code(__func__, result), data->user_data);
 
-       if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
-
-       g_variant_unref((GVariant *)user_data);
+       free(data);
 }
 /* LCOV_EXCL_STOP */
 
@@ -76,19 +70,20 @@ int nfc_manager_set_activation(bool activation,
                else
                        ret = NFC_ERROR_ALREADY_DEACTIVATED;
        } else {
-               GVariant *parameter;
+               nfc_activation_data_s *data = NULL;
+
+               data = (nfc_activation_data_s *)malloc(sizeof(nfc_activation_data_s));
 
-               parameter = g_variant_new("(uu)",
-                       callback,
-                       user_data);
-               if (parameter != NULL) {
+               if (data != NULL) {
+                       data->callback = callback;
+                       data->user_data = user_data;
                        ret = net_nfc_client_manager_set_active(activation,
                                _activation_changed_cb,
-                               parameter);
+                               data);
                        if (ret != NET_NFC_OK) {
                                LOG_ERR("net_nfc_client_manager_set_active fail");
 
-                               g_variant_unref(parameter);
+                               free(data);
                        }
                } else {
                        ret = NET_NFC_ALLOC_FAIL;