NFC api Sync with 3.0 branch

Signed-off-by: jh8801.jung <jh8801.jung@samsung.com>
Change-Id: Ia2347eedb4175ed3e601417357e9f258186f3424

diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec
index 36c386c..a844c40 100644 (file)
--- a/packaging/capi-network-nfc.spec
+++ b/packaging/capi-network-nfc.spec
@@ -1,6 +1,6 @@
 Name:       capi-network-nfc
 Summary:    A NFC library in Native API
-Version:    0.3.10
+Version:    0.3.11
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Apache-2.0

diff --git a/src/net_nfc_client_target_info.c b/src/net_nfc_client_target_info.c
index 3b6c659..c2f9364 100755 (executable)
--- a/src/net_nfc_client_target_info.c
+++ b/src/net_nfc_client_target_info.c
@@ -154,9 +154,8 @@ net_nfc_error_e net_nfc_get_tag_info_keys(net_nfc_target_info_h target_info,
                return NET_NFC_OK;
        }
 
-       i = handle->number_of_keys * sizeof(char *);
+       _net_nfc_util_alloc_mem(*keys, handle->number_of_keys * sizeof(char *));
 
-       _net_nfc_util_alloc_mem(*keys, i);
        if (*keys == NULL)
                return NET_NFC_ALLOC_FAIL;
 

diff --git a/src/nfc_p2p.c b/src/nfc_p2p.c
index 2218789..97d819a 100755 (executable)
--- a/src/nfc_p2p.c
+++ b/src/nfc_p2p.c
@@ -19,23 +19,20 @@
 /* LCOV_EXCL_START */
 static void _p2p_send_cb(net_nfc_error_e result, void *user_data)
 {
-       nfc_p2p_send_completed_cb callback;
-       void *user_param;
+       nfc_callback_s *user_param = user_data;
+       nfc_p2p_send_completed_cb callback = NULL;
 
        LOG_BEGIN();
-
-       if (user_data == NULL)
+       if (user_param == NULL)
                return;
 
-       g_variant_get((GVariant *)user_data,
-               "(tt)",
-               &callback,
-               &user_param);
+       callback = (nfc_p2p_send_completed_cb)user_param->callback;
 
+       LOGD("callback userdata : %p", user_param->user_data);
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
-       g_variant_unref((GVariant *)user_data);
+       free(user_data);
 }
 /* LCOV_EXCL_STOP */
 
@@ -46,7 +43,6 @@ int nfc_p2p_send(nfc_p2p_target_h target,
 {
        int ret;
        data_h rawdata;
-       GVariant *parameter;
 
        LOG_BEGIN();
 
@@ -59,17 +55,22 @@ int nfc_p2p_send(nfc_p2p_target_h target,
        CHECK_ACTIVATED();
        CHECK_APP_PERMISSION();
 
-       parameter = g_variant_new("(tt)",
-               callback,
-               user_data);
+       LOGD("api userdata : %p", user_data);
+       nfc_callback_s *parameter = NULL;
+
+       parameter = (nfc_callback_s *)malloc(sizeof(nfc_callback_s));
+
        if (parameter != NULL) {
+               parameter->callback = callback;
+               parameter->user_data = user_data;
+
                net_nfc_create_rawdata_from_ndef_message(message, &rawdata);
                ret = net_nfc_client_p2p_send((net_nfc_target_handle_h)target,
                        rawdata,
                        _p2p_send_cb,
                        parameter);
                if (ret != NET_NFC_OK)
-                       g_variant_unref(parameter);
+                       free(parameter);
 
                net_nfc_free_data(rawdata);
        } else {

diff --git a/src/nfc_tag.c b/src/nfc_tag.c
index 4e3251f..a476b82 100755 (executable)
--- a/src/nfc_tag.c
+++ b/src/nfc_tag.c
@@ -54,7 +54,7 @@ static void _tag_format_ndef_cb(net_nfc_error_e result,
        callback = (nfc_tag_format_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -136,7 +136,7 @@ static void _tag_read_ndef_cb(net_nfc_error_e result, ndef_message_h message,
        if (callback != NULL) {
                callback(nfc_common_convert_error_code(__func__, result),
                        (nfc_ndef_message_h)message,
-                       user_param);
+                       user_param->user_data);
        }
 
        free(user_param);
@@ -201,7 +201,7 @@ static void _tag_write_ndef_cb(net_nfc_error_e result,
        callback = (nfc_tag_write_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -306,7 +306,7 @@ static void _tag_transceive_data_cb(net_nfc_error_e result, data_h arg_data,
                callback(nfc_common_convert_error_code(__func__, result),
                        buffer,
                        length,
-                       user_param);
+                       user_param->user_data);
        }
 
        free(user_param);
@@ -504,7 +504,7 @@ static void _mifare_authenticate_with_keyA_cb(net_nfc_error_e result,
        callback = (nfc_mifare_authenticate_with_keyA_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -583,7 +583,7 @@ static void _mifare_authenticate_with_keyB_cb(net_nfc_error_e result,
        callback = (nfc_mifare_authenticate_with_keyB_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -675,7 +675,7 @@ static void _mifare_read_block_cb(net_nfc_error_e result, data_h data,
                callback(nfc_common_convert_error_code(__func__, result),
                        buffer,
                        length,
-                       user_param);
+                       user_param->user_data);
        }
 
        free(user_param);
@@ -772,7 +772,7 @@ static void _mifare_write_block_cb(net_nfc_error_e result, void *user_data)
        callback = (nfc_mifare_write_block_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -854,7 +854,7 @@ static void _mifare_write_page_cb(net_nfc_error_e result, void *user_data)
        callback = (nfc_mifare_write_page_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -935,7 +935,7 @@ static void _mifare_increment_cb(net_nfc_error_e result, void *user_data)
        callback = (nfc_mifare_increment_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -1004,7 +1004,7 @@ static void _mifare_decrement_cb(net_nfc_error_e result, void *user_data)
        callback = (nfc_mifare_decrement_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -1073,7 +1073,7 @@ static void _mifare_transfer_cb(net_nfc_error_e result, void *user_data)
        callback = (nfc_mifare_transfer_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }
@@ -1140,7 +1140,7 @@ static void _mifare_restore_cb(net_nfc_error_e result, void *user_data)
        callback = (nfc_mifare_restore_completed_cb)user_param->callback;
 
        if (callback != NULL)
-               callback(nfc_common_convert_error_code(__func__, result), user_param);
+               callback(nfc_common_convert_error_code(__func__, result), user_param->user_data);
 
        free(user_param);
 }