revise logging and coding style

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

diff --git a/client/net_nfc_client_ndef_message.c b/client/net_nfc_client_ndef_message.c
index 74272e7..7f561a9 100644 (file)
--- a/client/net_nfc_client_ndef_message.c
+++ b/client/net_nfc_client_ndef_message.c
@@ -31,24 +31,22 @@ API net_nfc_error_e net_nfc_create_ndef_message(ndef_message_s **ndef_message)
 API net_nfc_error_e net_nfc_create_rawdata_from_ndef_message(
                ndef_message_s *ndef_message, data_s **rawdata)
 {
+       data_s *data;
        uint32_t count;
        net_nfc_error_e result;
-       data_s *data;
 
-       if (ndef_message == NULL || rawdata == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
+       RETV_IF(NULL == rawdata, NET_NFC_NULL_PARAMETER);
 
        *rawdata = NULL;
 
        result = net_nfc_get_ndef_message_byte_length(ndef_message, &count);
-       if (result != NET_NFC_OK) {
+       if (result != NET_NFC_OK)
                return result;
-       }
 
        result = net_nfc_create_data(&data ,NULL, count);
-       if (result != NET_NFC_OK) {
+       if (result != NET_NFC_OK)
                return result;
-       }
 
        result = net_nfc_util_convert_ndef_message_to_rawdata(ndef_message, data);
 
@@ -63,11 +61,11 @@ API net_nfc_error_e net_nfc_create_rawdata_from_ndef_message(
 API net_nfc_error_e net_nfc_create_ndef_message_from_rawdata(
                ndef_message_s **ndef_message, data_s *rawdata)
 {
-       net_nfc_error_e result;
        ndef_message_s *msg;
+       net_nfc_error_e result;
 
-       if (ndef_message == NULL || rawdata == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
+       RETV_IF(NULL == rawdata, NET_NFC_NULL_PARAMETER);
 
        *ndef_message = NULL;
 
@@ -89,8 +87,8 @@ API net_nfc_error_e net_nfc_get_ndef_message_byte_length(
 {
        net_nfc_error_e result;
 
-       if (ndef_message == NULL || length == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
+       RETV_IF(NULL == length, NET_NFC_NULL_PARAMETER);
 
        *length = net_nfc_util_get_ndef_message_length(ndef_message);
        if (*length > 0)
@@ -104,16 +102,15 @@ API net_nfc_error_e net_nfc_get_ndef_message_byte_length(
 API net_nfc_error_e net_nfc_append_record_to_ndef_message(
                ndef_message_s *ndef_message, ndef_record_s *record)
 {
-       if (ndef_message == NULL || record == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
+       RETV_IF(NULL == record, NET_NFC_NULL_PARAMETER);
 
        return net_nfc_util_append_record(ndef_message, record);
 }
 
 API net_nfc_error_e net_nfc_free_ndef_message(ndef_message_s *ndef_message)
 {
-       if (ndef_message == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
 
        return net_nfc_util_free_ndef_message(ndef_message);
 }
@@ -121,8 +118,8 @@ API net_nfc_error_e net_nfc_free_ndef_message(ndef_message_s *ndef_message)
 API net_nfc_error_e net_nfc_get_ndef_message_record_count(
                ndef_message_s *ndef_message, int *count)
 {
-       if (ndef_message == NULL || count == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
+       RETV_IF(NULL == count, NET_NFC_NULL_PARAMETER);
 
        *count = ndef_message->recordCount;
        return NET_NFC_OK;
@@ -161,12 +158,11 @@ API net_nfc_error_e net_nfc_remove_record_by_index(ndef_message_s *ndef_message,
 API net_nfc_error_e net_nfc_retrieve_current_ndef_message(
                ndef_message_s **ndef_message)
 {
-       net_nfc_error_e result = NET_NFC_UNKNOWN_ERROR;
-       char file_path[PATH_MAX] = { 0, };
        FILE *fp = NULL;
+       char file_path[PATH_MAX] = { 0, };
+       net_nfc_error_e result = NET_NFC_UNKNOWN_ERROR;
 
-       if (ndef_message == NULL)
-               return NET_NFC_NULL_PARAMETER;
+       RETV_IF(NULL == ndef_message, NET_NFC_NULL_PARAMETER);
 
        snprintf(file_path, sizeof(file_path), "%s/%s/%s", NET_NFC_MANAGER_DATA_PATH,
                        NET_NFC_MANAGER_DATA_PATH_MESSAGE, NET_NFC_MANAGER_NDEF_FILE_NAME);
@@ -200,11 +196,11 @@ API net_nfc_error_e net_nfc_retrieve_current_ndef_message(
                                                break;
                                } while (offset < data.length);
 
-                               if (offset == data.length) {
+                               if (offset == data.length)
                                        result = net_nfc_create_ndef_message_from_rawdata(ndef_message, &data);
-                               } else {
+                               else
                                        NFC_ERR("failed to read ndef message");
-                               }
+
                                net_nfc_util_free_data(&data);
                        }
                        else