From 1d099ad988f852fc1069e3ad932c69c2d3a0f509 Mon Sep 17 00:00:00 2001 From: "saerome.kim" Date: Mon, 30 Jul 2018 14:44:14 +0900 Subject: [PATCH] Added a gcov flag to gauge line & function coverage - Increased line & function covererage as well. Change-Id: Ie8fec65ae1c2f6ae7a69267a566756e9cd9fa943 Signed-off-by: saerome.kim --- CMakeLists.txt | 7 +++- include/nfc_common.h | 4 ++ packaging/capi-network-nfc.spec | 9 ++++- src/nfc_card_emulation.c | 80 +++++++++++++++++++-------------------- src/nfc_manager.c | 14 ++++++- src/nfc_p2p_handover.c | 83 +++++++++++++++++++++-------------------- 6 files changed, 111 insertions(+), 86 deletions(-) mode change 100755 => 100644 include/nfc_common.h mode change 100755 => 100644 src/nfc_card_emulation.c mode change 100755 => 100644 src/nfc_manager.c mode change 100755 => 100644 src/nfc_p2p_handover.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bb16c3..36b7ac2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,8 +43,11 @@ pkg_check_modules(${fw_name} REQUIRED ${dependents}) FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) - -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") +IF(BUILD_GCOV) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fprofile-arcs -ftest-coverage") +ELSE(BUILD_GCOV) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") +ENDIF(BUILD_GCOV) SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") diff --git a/include/nfc_common.h b/include/nfc_common.h old mode 100755 new mode 100644 index 9009a26..fc49bbd --- a/include/nfc_common.h +++ b/include/nfc_common.h @@ -56,10 +56,12 @@ #define CHECK_SUPPORTED(str) \ do { \ + /* LCOV_EXCL_START */ \ if (nfc_common_is_supported(str) == false) { \ LOG_ERR("[ERROR][%s] NFC not supported", __func__); \ return NFC_ERROR_NOT_SUPPORTED; \ } \ + /* LCOV_EXCL_STOP */ \ } while (0) #define CHECK_ACTIVATED() \ @@ -102,7 +104,9 @@ } while (0) #define LOG_BEGIN() \ do { \ + /* LCOV_EXCL_START */ \ LOGD(COLOR_BLUE"BEGIN >>>>"COLOR_END); \ + /* LCOV_EXCL_STOP */ \ } while (0) #define LOG_END() \ do { \ diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec index 913ba24..f5602ac 100644 --- a/packaging/capi-network-nfc.spec +++ b/packaging/capi-network-nfc.spec @@ -36,12 +36,17 @@ This package contains the development files for %{name}. %build +%if 0%{?gcov:1} +export LDFLAGS+=" -lgcov" +%endif + export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE" export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir} +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir} \ + -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} make %{?jobs:-j%jobs} @@ -64,4 +69,4 @@ rm -rf %{buildroot} %{_includedir}/network/*.h %{_libdir}/pkgconfig/*.pc %{_libdir}/libcapi-network-nfc.so -%{_bindir}/nfc_unit_test \ No newline at end of file +%{_bindir}/nfc_unit_test diff --git a/src/nfc_card_emulation.c b/src/nfc_card_emulation.c old mode 100755 new mode 100644 index ec3d486..83599ba --- a/src/nfc_card_emulation.c +++ b/src/nfc_card_emulation.c @@ -24,9 +24,9 @@ int nfc_se_open_secure_element_internal( net_nfc_se_type_e type; net_nfc_target_handle_h temp = NULL; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -64,11 +64,11 @@ int nfc_se_send_apdu_internal(nfc_se_h handle, unsigned int *resp_len) { net_nfc_error_e result; - data_h command = NULL; + data_h command = NULL; // LCOV_EXCL_LINE - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -129,11 +129,11 @@ int nfc_se_send_apdu_internal(nfc_se_h handle, int nfc_se_get_atr_internal(nfc_se_h handle, unsigned char **atr, unsigned int *atr_len) { net_nfc_error_e result; - data_h response = NULL; + data_h response = NULL; // LCOV_EXCL_LINE - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -177,9 +177,9 @@ int nfc_se_close_secure_element_internal(nfc_se_h handle) { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -196,9 +196,9 @@ int nfc_se_enable_card_emulation() { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -231,9 +231,9 @@ int nfc_se_get_card_emulation_mode(nfc_se_card_emulation_mode_type_e *mode) net_nfc_error_e result; net_nfc_card_emulation_mode_t se_mode; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -260,9 +260,9 @@ int nfc_hce_send_apdu_response(nfc_se_h handle, unsigned char *resp, unsigned in net_nfc_error_e result; data_h data; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -286,9 +286,9 @@ int nfc_se_set_default_route(nfc_se_type_e powered_on_status, nfc_se_type_e powe { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -303,9 +303,9 @@ int nfc_se_is_activated_handler_for_aid(nfc_se_type_e se_type, const char *aid, { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -340,9 +340,9 @@ int nfc_se_register_aid(nfc_se_type_e se_type, nfc_card_emulation_category_type_ { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -358,9 +358,9 @@ int nfc_se_unregister_aid(nfc_se_type_e se_type, nfc_card_emulation_category_typ { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -376,9 +376,9 @@ int nfc_se_get_registered_aids_count(nfc_se_type_e se_type, nfc_card_emulation_c { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -414,9 +414,9 @@ int nfc_se_foreach_registered_aids(nfc_se_type_e se_type, nfc_card_emulation_cat { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -440,9 +440,9 @@ int nfc_se_add_route_for_aid_internal(const char *aid, nfc_se_type_e se_type, co { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -459,9 +459,9 @@ int nfc_se_remove_route_for_aid_internal(const char* pkg_name, const char *aid) { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -482,9 +482,9 @@ int nfc_se_foreach_registered_handlers( { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE CHECK_INIT(); CHECK_INVALID(callback == NULL); @@ -498,9 +498,9 @@ int nfc_se_set_preferred_handler() { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -516,9 +516,9 @@ int nfc_se_unset_preferred_handler() { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_FEATURE); + CHECK_SUPPORTED(NFC_CE_FEATURE); // LCOV_EXCL_LINE /* LCOV_EXCL_START */ CHECK_INIT(); @@ -535,9 +535,9 @@ int nfc_se_get_conflict_handlers_internal(const char *package, { net_nfc_error_e result; - LOG_BEGIN(); + LOG_BEGIN(); // LCOV_EXCL_LINE - CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); + CHECK_SUPPORTED(NFC_CE_HCE_FEATURE); // LCOV_EXCL_LINE CHECK_INIT(); CHECK_ACTIVATED(); diff --git a/src/nfc_manager.c b/src/nfc_manager.c old mode 100755 new mode 100644 index bb9b023..5ccff0a --- a/src/nfc_manager.c +++ b/src/nfc_manager.c @@ -27,7 +27,7 @@ bool nfc_manager_is_supported(void) if (nfc_supported == true) set_last_result(NFC_ERROR_NONE); else - set_last_result(NFC_ERROR_NOT_SUPPORTED); + set_last_result(NFC_ERROR_NOT_SUPPORTED); // LCOV_EXCL_LINE return nfc_supported; } @@ -139,9 +139,11 @@ void nfc_manager_unset_activation_changed_cb(void) LOG_BEGIN(); if (nfc_common_is_supported(NFC_FEATURE) == false) { + /* LCOV_EXCL_START */ LOG_ERR("NFC not supported"); set_last_result(NFC_ERROR_NOT_SUPPORTED); return; + /* LCOV_EXCL_END */ } /* LCOV_EXCL_START */ @@ -277,9 +279,11 @@ void nfc_manager_unset_ndef_discovered_cb(void) LOG_BEGIN(); if (nfc_common_is_supported(NFC_FEATURE) == false) { + /* LCOV_EXCL_START */ LOG_ERR("NFC not supported"); set_last_result(NFC_ERROR_NOT_SUPPORTED); return; + /* LCOV_EXCL_STOP */ } /* LCOV_EXCL_START */ @@ -601,9 +605,11 @@ bool nfc_manager_is_system_handler_enabled(void) LOG_BEGIN(); if (nfc_common_is_supported(NFC_FEATURE) == false) { + /* LCOV_EXCL_START */ LOG_ERR("NFC not supported"); set_last_result(NFC_ERROR_NOT_SUPPORTED); return false; + /* LCOV_EXCL_STOP */ } /* LCOV_EXCL_START */ @@ -686,9 +692,11 @@ void nfc_manager_unset_se_event_cb(void) LOG_BEGIN(); if (nfc_common_is_supported(NFC_CE_FEATURE) == false) { + /* LCOV_EXCL_START */ LOG_ERR("NFC not supported"); set_last_result(NFC_ERROR_NOT_SUPPORTED); return; + /* LCOV_EXCL_STOP */ } /* LCOV_EXCL_START */ @@ -770,9 +778,11 @@ void nfc_manager_unset_se_transaction_event_cb(nfc_se_type_e se_type) LOG_BEGIN(); if (nfc_common_is_supported(NFC_CE_FEATURE) == false) { + /* LCOV_EXCL_START */ LOG_ERR("NFC not supported"); set_last_result(NFC_ERROR_NOT_SUPPORTED); return; + /* LCOV_EXCL_STOP */ } /* LCOV_EXCL_START */ @@ -944,9 +954,11 @@ void nfc_manager_unset_hce_event_cb(void) LOG_BEGIN(); if (nfc_common_is_supported(NFC_CE_HCE_FEATURE) == false) { + /* LCOV_EXCL_START */ LOG_ERR("NFC not supported"); set_last_result(NFC_ERROR_NOT_SUPPORTED); return; + /* LCOV_EXCL_STOP */ } /* LCOV_EXCL_START */ diff --git a/src/nfc_p2p_handover.c b/src/nfc_p2p_handover.c old mode 100755 new mode 100644 index a5b08b9..58ce301 --- a/src/nfc_p2p_handover.c +++ b/src/nfc_p2p_handover.c @@ -79,6 +79,7 @@ static void _p2p_handover_cb(net_nfc_error_e result, } /* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_p2p_connection_handover(nfc_p2p_target_h target, nfc_ac_type_e type, nfc_p2p_connection_handover_completed_cb callback, @@ -93,7 +94,6 @@ int nfc_p2p_connection_handover(nfc_p2p_target_h target, CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(target == NULL); CHECK_INVALID(type < 0); @@ -134,8 +134,9 @@ int nfc_p2p_connection_handover(nfc_p2p_target_h target, } return nfc_common_convert_error_code(__func__, ret); - /* LCOV_EXCL_STOP */ + } +/* LCOV_EXCL_STOP */ /* LCOV_EXCL_START */ static void _connection_handover_event_cb( @@ -199,13 +200,13 @@ static void _connection_handover_event_cb( } /* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_connection_handover_set_event_cb(nfc_connection_handover_event_cb callback, void *user_data) { LOG_BEGIN(); CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(callback == NULL); @@ -215,16 +216,16 @@ int nfc_connection_handover_set_event_cb(nfc_connection_handover_event_cb callba net_nfc_client_handover_set_handover_event_cb(_connection_handover_event_cb, NULL); return NFC_ERROR_NONE; - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_connection_handover_unset_event_cb(void) { LOG_BEGIN(); CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); net_nfc_client_handover_unset_handover_event_cb(); @@ -233,9 +234,10 @@ int nfc_connection_handover_unset_event_cb(void) gdbus_nfc_context.on_handover_event_user_data = NULL; return NFC_ERROR_NONE; - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ bool nfc_p2p_is_supported_ac_type(nfc_ac_type_e carrier) { bool _is_support_p2p = false; @@ -249,7 +251,6 @@ bool nfc_p2p_is_supported_ac_type(nfc_ac_type_e carrier) return false; } - /* LCOV_EXCL_START */ if (carrier == NFC_AC_TYPE_BT) _is_support_ac_type = true; @@ -259,9 +260,10 @@ bool nfc_p2p_is_supported_ac_type(nfc_ac_type_e carrier) set_last_result(NFC_ERROR_NOT_SUPPORTED); return _is_support_ac_type; - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_message_import_from_ndef_message(nfc_handover_message_h *result, nfc_ndef_message_h msg) { net_nfc_error_e ret; @@ -270,7 +272,6 @@ int nfc_handover_message_import_from_ndef_message(nfc_handover_message_h *result CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(msg == NULL); CHECK_INVALID(result == NULL); @@ -279,9 +280,10 @@ int nfc_handover_message_import_from_ndef_message(nfc_handover_message_h *result (ndef_message_h)msg, (net_nfc_ch_message_h *)result); return nfc_common_convert_error_code(__func__, ret); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_message_get_random_number(nfc_handover_message_h message, unsigned short *random_number) { net_nfc_error_e result; @@ -290,7 +292,6 @@ int nfc_handover_message_get_random_number(nfc_handover_message_h message, unsig CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(message == NULL); CHECK_INVALID(random_number == NULL); @@ -300,9 +301,10 @@ int nfc_handover_message_get_random_number(nfc_handover_message_h message, unsig random_number); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_message_get_carrier_count(nfc_handover_message_h message, unsigned int *count) { net_nfc_error_e result; @@ -311,7 +313,6 @@ int nfc_handover_message_get_carrier_count(nfc_handover_message_h message, unsig CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(message == NULL); CHECK_INVALID(count == NULL); @@ -321,9 +322,10 @@ int nfc_handover_message_get_carrier_count(nfc_handover_message_h message, unsig count); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_message_get_carrier(nfc_handover_message_h message, int index, nfc_handover_carrier_h *carrier) { net_nfc_error_e result; @@ -332,7 +334,7 @@ int nfc_handover_message_get_carrier(nfc_handover_message_h message, int index, CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ + CHECK_INIT(); CHECK_INVALID(message == NULL); CHECK_INVALID(carrier == NULL); @@ -343,9 +345,10 @@ int nfc_handover_message_get_carrier(nfc_handover_message_h message, int index, (net_nfc_ch_carrier_h *)carrier); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_message_get_carrier_by_type(nfc_handover_message_h message, nfc_ac_type_e type, nfc_handover_carrier_h *carrier) { net_nfc_error_e result; @@ -355,7 +358,6 @@ int nfc_handover_message_get_carrier_by_type(nfc_handover_message_h message, nfc CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(message == NULL); CHECK_INVALID(carrier == NULL); @@ -383,9 +385,10 @@ int nfc_handover_message_get_carrier_by_type(nfc_handover_message_h message, nfc (net_nfc_ch_carrier_h *)carrier); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_message_destroy(nfc_handover_message_h message) { net_nfc_error_e result; @@ -394,17 +397,16 @@ int nfc_handover_message_destroy(nfc_handover_message_h message) CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(message == NULL); result = net_nfc_free_handover_message((net_nfc_ch_message_h)message); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ - +/* LCOV_EXCL_START */ int nfc_handover_carrier_get_cps(nfc_handover_carrier_h carrier, nfc_ac_state_e *cps) { net_nfc_error_e result; @@ -414,7 +416,6 @@ int nfc_handover_carrier_get_cps(nfc_handover_carrier_h carrier, nfc_ac_state_e CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(carrier == NULL); CHECK_INVALID(cps == NULL); @@ -442,9 +443,10 @@ int nfc_handover_carrier_get_cps(nfc_handover_carrier_h carrier, nfc_ac_state_e } return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_carrier_get_type(nfc_handover_carrier_h carrier, nfc_ac_type_e *type) { net_nfc_error_e result; @@ -454,7 +456,6 @@ int nfc_handover_carrier_get_type(nfc_handover_carrier_h carrier, nfc_ac_type_e CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(carrier == NULL); CHECK_INVALID(type == NULL); @@ -482,9 +483,10 @@ int nfc_handover_carrier_get_type(nfc_handover_carrier_h carrier, nfc_ac_type_e } return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_carrier_get_carrier_record(nfc_handover_carrier_h carrier, nfc_ndef_record_h *record) { net_nfc_error_e result; @@ -493,7 +495,6 @@ int nfc_handover_carrier_get_carrier_record(nfc_handover_carrier_h carrier, nfc_ CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(carrier == NULL); CHECK_INVALID(record == NULL); @@ -502,9 +503,10 @@ int nfc_handover_carrier_get_carrier_record(nfc_handover_carrier_h carrier, nfc_ (net_nfc_ch_carrier_h)carrier, (ndef_record_h *)record); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_carrier_get_auxiliary_record_count(nfc_handover_carrier_h carrier, unsigned int *count) { net_nfc_error_e result; @@ -513,7 +515,6 @@ int nfc_handover_carrier_get_auxiliary_record_count(nfc_handover_carrier_h carri CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(carrier == NULL); CHECK_INVALID(count == NULL); @@ -522,9 +523,10 @@ int nfc_handover_carrier_get_auxiliary_record_count(nfc_handover_carrier_h carri (net_nfc_ch_carrier_h)carrier, count); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_carrier_get_auxiliary_record(nfc_handover_carrier_h carrier, int index, nfc_ndef_record_h *record) { net_nfc_error_e result; @@ -533,7 +535,7 @@ int nfc_handover_carrier_get_auxiliary_record(nfc_handover_carrier_h carrier, in CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ + CHECK_INIT(); CHECK_INVALID(carrier == NULL); CHECK_INVALID(record == NULL); @@ -543,9 +545,10 @@ int nfc_handover_carrier_get_auxiliary_record(nfc_handover_carrier_h carrier, in index, (ndef_record_h *)record); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_carrier_get_handover_config(nfc_handover_carrier_h carrier, nfc_handover_config_h *config) { net_nfc_error_e result; @@ -554,7 +557,7 @@ int nfc_handover_carrier_get_handover_config(nfc_handover_carrier_h carrier, nfc CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ + CHECK_INIT(); CHECK_INVALID(carrier == NULL); CHECK_INVALID(config == NULL); @@ -564,9 +567,10 @@ int nfc_handover_carrier_get_handover_config(nfc_handover_carrier_h carrier, nfc (net_nfc_ch_carrier_h)carrier); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_carrier_destroy(nfc_handover_carrier_h carrier) { net_nfc_error_e result; @@ -575,17 +579,16 @@ int nfc_handover_carrier_destroy(nfc_handover_carrier_h carrier) CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(carrier == NULL); result = net_nfc_free_handover_carrier((net_nfc_ch_carrier_h)carrier); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ - +/* LCOV_EXCL_START */ int nfc_handover_config_get_property(nfc_handover_config_h config, unsigned short attribute, unsigned short *size, unsigned char **data) { net_nfc_error_e result; @@ -594,7 +597,6 @@ int nfc_handover_config_get_property(nfc_handover_config_h config, unsigned shor CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(config == NULL); CHECK_INVALID(size == NULL); @@ -605,9 +607,10 @@ int nfc_handover_config_get_property(nfc_handover_config_h config, unsigned shor attribute, size, data); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_STOP */ +/* LCOV_EXCL_START */ int nfc_handover_config_destroy(nfc_handover_config_h config) { net_nfc_error_e result; @@ -616,13 +619,11 @@ int nfc_handover_config_destroy(nfc_handover_config_h config) CHECK_SUPPORTED(NFC_P2P_FEATURE); - /* LCOV_EXCL_START */ CHECK_INIT(); CHECK_INVALID(config == NULL); result = net_nfc_free_carrier_config((net_nfc_carrier_config_h)config); return nfc_common_convert_error_code(__func__, result); - /* LCOV_EXCL_STOP */ } - +/* LCOV_EXCL_STOP */ -- 2.7.4