apply the lastest nfc-manager that revised cumbersome structure that is a opaque...

Change-Id: If3833736508340592876a8b09324cdeb33fe519a

diff --git a/packaging/nfc-plugin-emul.spec b/packaging/nfc-plugin-emul.spec
index a11d3c60af087907fbe0ef6e346beaf11ec9991e..862081bdde533e0bec7003a1833ae92c3af51928 100644 (file)
--- a/packaging/nfc-plugin-emul.spec
+++ b/packaging/nfc-plugin-emul.spec
@@ -1,6 +1,6 @@
 Name:       nfc-plugin-emul
 Summary:    NFC emul plugin
-Version:    0.0.11
+Version:    0.0.12
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Apache-2.0

diff --git a/src/oem/oem_emul.c b/src/oem/oem_emul.c
index ae0348f4f76ad13fec7f953705f52ef86c7ceb50..139e19cf91d897b414393269e52850fdc159cc38 100644 (file)
--- a/src/oem/oem_emul.c
+++ b/src/oem/oem_emul.c
@@ -762,17 +762,21 @@ static int _net_nfc_create_records_from_emulMsg(ndef_message_s **ndef_message, i
 #endif
 
                /* create record */
-               ndef_record_h new_record = NULL;
+               ndef_record_s *new_record = NULL;
                net_nfc_error_e result = NET_NFC_OK;
 
                if (record.tnf == NET_NFC_RECORD_EMPTY) {
-                       if((result = net_nfc_util_create_record(NET_NFC_RECORD_EMPTY, &record.typeName, &record.id, &record.payload, (ndef_record_s **) &new_record)) != NET_NFC_OK) {
+                       result = net_nfc_util_create_record(NET_NFC_RECORD_EMPTY, &record.typeName,
+                                       &record.id, &record.payload, &new_record);
+                       if(result != NET_NFC_OK) {
                                DEBUG_MSG("net_nfc_create_record failed[%d]", result);
                                goto ERROR;;
                        }
                }
                else if (record.tnf == NET_NFC_RECORD_UNKNOWN) {
-                       if((result = net_nfc_util_create_record(NET_NFC_RECORD_UNKNOWN, &record.typeName, &record.id, &record.payload, (ndef_record_s **) &new_record)) != NET_NFC_OK) {
+                       result = net_nfc_util_create_record(NET_NFC_RECORD_UNKNOWN, &record.typeName,
+                                       &record.id, &record.payload, &new_record);
+                       if(result != NET_NFC_OK) {
                                DEBUG_MSG("net_nfc_create_record failed[%d]", result);
                                goto ERROR;;
                        }
@@ -798,8 +802,10 @@ static int _net_nfc_create_records_from_emulMsg(ndef_message_s **ndef_message, i
                                        memcpy(payload_data.buffer + 1, record.payload.buffer, payload_data.length - 1);
                                }
 
-                               if (net_nfc_util_create_record(record.tnf, &record.typeName, &record.id, &payload_data, (ndef_record_s**) &new_record) != NET_NFC_OK){
-                                       DEBUG_ERR_MSG("net_nfc_util_create_record is failed");
+                               result = net_nfc_util_create_record(record.tnf, &record.typeName,
+                                               &record.id, &payload_data, &new_record);
+                               if (result != NET_NFC_OK){
+                                       DEBUG_ERR_MSG("net_nfc_util_create_record is failed(%d)", result);
                                        goto ERROR;
                                }
 
@@ -836,8 +842,10 @@ static int _net_nfc_create_records_from_emulMsg(ndef_message_s **ndef_message, i
 
                                }
 
-                               if (net_nfc_util_create_record(record.tnf, &record.typeName, &record.id, &payload_data, (ndef_record_s**) &new_record) != NET_NFC_OK){
-                                       DEBUG_ERR_MSG("net_nfc_util_create_record is failed");
+                               result = net_nfc_util_create_record(record.tnf, &record.typeName,
+                                               &record.id, &payload_data, &new_record);
+                               if (result != NET_NFC_OK){
+                                       DEBUG_ERR_MSG("net_nfc_util_create_record is failed(%d)", result);
                                        goto ERROR;
                                }
 
@@ -925,21 +933,26 @@ static int _net_nfc_create_records_from_emulMsg(ndef_message_s **ndef_message, i
                        }
 
                        /* create record */
-                       if((result = net_nfc_util_create_record(record.tnf, &record.typeName, &record.id, &filePayload, (ndef_record_s **) &new_record)) != NET_NFC_OK) {
+                       result = net_nfc_util_create_record(record.tnf, &record.typeName, &record.id,
+                                       &filePayload, &new_record);
+                       if(result != NET_NFC_OK) {
                                DEBUG_MSG("net_nfc_create_record failed[%d]", result);
                                goto ERROR;;
                        }
                }
                else {
                        /* NET_NFC_RECORD_URI or NET_NFC_RECORD_EXTERNAL_RTD */
-                       if((result = net_nfc_util_create_record(record.tnf, &record.typeName, &record.id, &record.payload, (ndef_record_s **) &new_record)) != NET_NFC_OK) {
+                       result = net_nfc_util_create_record(record.tnf, &record.typeName, &record.id,
+                                       &record.payload, &new_record);
+                       if(result != NET_NFC_OK) {
                                DEBUG_MSG("net_nfc_create_record failed[%d]", result);
                                goto ERROR;;
                        }
                }
 
                /* append record to ndef msg */
-               if((result = net_nfc_util_append_record((ndef_message_s*) *ndef_message, (ndef_record_s *) new_record)) != NET_NFC_OK){
+               result = net_nfc_util_append_record(*ndef_message, new_record);
+               if(result != NET_NFC_OK){
                        DEBUG_MSG("net_nfc_util_append_record failed[%d]", result);
                        goto ERROR;;
                }
@@ -991,19 +1004,19 @@ static bool _net_nfc_create_ndef_from_emulMsg(void)
 
 
        /* create ndef msg */
-       ndef_message_h ndef_message = NULL;
+       ndef_message_s *ndef_message = NULL;
        int ndef_length = 0;
 
-       if((result = net_nfc_util_create_ndef_message ((ndef_message_s **) &ndef_message)) != NET_NFC_OK)
+       if((result = net_nfc_util_create_ndef_message (&ndef_message)) != NET_NFC_OK)
        {
                DEBUG_MSG("failed to create ndef message [%d]", result);
        }
 
        /* create records and append it to ndef_msg*/
-       gSdkMsg.record_count = _net_nfc_create_records_from_emulMsg((ndef_message_s **) &ndef_message, record_count);
+       gSdkMsg.record_count = _net_nfc_create_records_from_emulMsg(&ndef_message, record_count);
 
        /* convert ndef msg to raw data */
-       ndef_length = net_nfc_util_get_ndef_message_length ((ndef_message_s *) ndef_message);
+       ndef_length = net_nfc_util_get_ndef_message_length (ndef_message);
 
        if (!ndef_length){
                DEBUG_MSG("ndef_message size is zero!");
@@ -1012,9 +1025,9 @@ static bool _net_nfc_create_ndef_from_emulMsg(void)
        gSdkMsg.rawdata.length = ndef_length;
        _nfc_emul_util_alloc_mem(gSdkMsg.rawdata.buffer, ndef_length);
 
-       if((result = net_nfc_util_convert_ndef_message_to_rawdata((ndef_message_s*)ndef_message, (data_s*) & gSdkMsg.rawdata)) != NET_NFC_OK) {
+       result = net_nfc_util_convert_ndef_message_to_rawdata(ndef_message, &gSdkMsg.rawdata);
+       if(result != NET_NFC_OK) {
                DEBUG_MSG("net_nfc_util_convert_ndef_message_to_rawdata is failed![%d]", result);
-
        }
 
        net_nfc_util_free_ndef_message(ndef_message);