From 106bd26c6c4b7f03909693dd10467159980a61cc Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Tue, 13 Jun 2017 16:39:20 +0900 Subject: [PATCH] Fix to follow coding style - Change line coverage comment string --- src/mesh.c | 138 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 46 deletions(-) diff --git a/src/mesh.c b/src/mesh.c index e61014d..8b9d55c 100644 --- a/src/mesh.c +++ b/src/mesh.c @@ -33,14 +33,18 @@ EXPORT_API int mesh_network_new(mesh_network_h* network) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net = calloc(1, sizeof(struct mesh_network_s)); if (NULL == net) { - LOGE("Out of memory"); //LCOV_EXCL_LINE - return MESH_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Out of memory"); + return MESH_ERROR_OUT_OF_MEMORY; + /* LCOV_EXCL_STOP */ } *network = (mesh_network_h)net; @@ -55,14 +59,18 @@ EXPORT_API int mesh_network_clone(mesh_network_h* dst, mesh_network_h src) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (dst == NULL || src == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net = calloc(1, sizeof(struct mesh_network_s)); if (NULL == net) { - LOGE("Out of memory"); //LCOV_EXCL_LINE - return MESH_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Out of memory"); + return MESH_ERROR_OUT_OF_MEMORY; + /* LCOV_EXCL_STOP */ } snprintf(net->meshid, MAX_MESHID_LEN, "%s", _src->meshid); snprintf(net->bssid, MAX_BSSID_LEN, "%s", _src->bssid); @@ -87,8 +95,10 @@ EXPORT_API int mesh_network_new_with(mesh_network_h* network, const char *meshid CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net = calloc(1, sizeof(struct mesh_network_s)); @@ -114,8 +124,10 @@ EXPORT_API void mesh_network_destroy(mesh_network_h network) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (NULL == net) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return; + /* LCOV_EXCL_STOP */ } free(net); @@ -128,8 +140,10 @@ EXPORT_API int mesh_network_get_meshid(mesh_network_h network, char **meshid) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || meshid == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *meshid = strdup(net->meshid); @@ -144,8 +158,10 @@ EXPORT_API int mesh_network_set_meshid(mesh_network_h network, const char *meshi CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || meshid == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } snprintf(net->meshid, MAX_MESHID_LEN, "%s", meshid); @@ -160,8 +176,10 @@ EXPORT_API int mesh_network_get_bssid(mesh_network_h network, char **bssid) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || bssid == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *bssid = strdup(net->bssid); @@ -176,8 +194,10 @@ EXPORT_API int mesh_network_set_bssid(mesh_network_h network, const char *bssid) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || bssid == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } snprintf(net->bssid, MAX_BSSID_LEN, "%s", bssid); @@ -192,8 +212,10 @@ EXPORT_API int mesh_network_get_channel(mesh_network_h network, int *channel) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || channel == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *channel = net->channel; @@ -208,8 +230,10 @@ EXPORT_API int mesh_network_set_channel(mesh_network_h network, int channel) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net->channel = channel; @@ -224,8 +248,10 @@ EXPORT_API int mesh_network_get_rssi(mesh_network_h network, int *rssi) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || rssi == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *rssi = net->rssi; @@ -240,8 +266,10 @@ EXPORT_API int mesh_network_set_rssi(mesh_network_h network, int rssi) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net->rssi = rssi; @@ -256,8 +284,10 @@ EXPORT_API int mesh_network_get_data_rate(mesh_network_h network, int *data_rate CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || data_rate == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *data_rate = net->data_rate; @@ -272,8 +302,10 @@ EXPORT_API int mesh_network_set_data_rate(mesh_network_h network, int data_rate) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net->data_rate = data_rate; @@ -288,8 +320,10 @@ EXPORT_API int mesh_network_get_security(mesh_network_h network, mesh_security_t CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || security == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *security = net->security; @@ -304,8 +338,10 @@ EXPORT_API int mesh_network_set_security(mesh_network_h network, mesh_security_t CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } net->security = security; @@ -320,8 +356,10 @@ EXPORT_API int mesh_network_set_passphrase(mesh_network_h network, const char* p CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } if (passphrase) @@ -340,8 +378,10 @@ EXPORT_API int mesh_network_get_connection_state(mesh_network_h network, CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (network == NULL || state == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *state = net->state; @@ -356,8 +396,10 @@ EXPORT_API int mesh_peer_get_address(mesh_peer_h peer, char **address) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (peer == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } *address = strdup(peer_info->address); @@ -373,15 +415,19 @@ EXPORT_API int mesh_initialize(mesh_h *mesh) CHECK_FEATURE_SUPPORTED(MESH_FEATURE); if (mesh == NULL) { - LOGE("Invalid parameter"); //LCOV_EXCL_LINE - return MESH_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Invalid parameter"); + return MESH_ERROR_INVALID_PARAMETER; + /* LCOV_EXCL_STOP */ } #if 0 rv = _mesh_init(); if (rv != MESH_ERROR_NONE) { - LOGE("Failed to initialize mesh network");//LCOV_EXCL_LINE - return rv; //LCOV_EXCL_LINE + /* LCOV_EXCL_START */ + LOGE("Failed to initialize mesh network"); + return rv; + /* LCOV_EXCL_STOP */ } #endif -- 2.34.1