From d0b9b9ac20c8ea7dfd93fae71a03ad1faf81fc64 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Wed, 10 Oct 2018 11:20:19 -0500 Subject: [PATCH] test apps: fix astyle --- .../source/mac_commands.cpp | 52 ++++----- .../nanostack_mac_tester/source/util.cpp | 104 ++++++++++++------ 2 files changed, 95 insertions(+), 61 deletions(-) diff --git a/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.cpp b/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.cpp index 2cde6ee88c..ceef2f6a39 100644 --- a/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.cpp +++ b/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.cpp @@ -406,7 +406,7 @@ static int handle_security_args(int argc, char *argv[], mlme_security_t *key) } } if (cmd_parameter_val(argc, argv, "--key_source", &str)) { - if (strlen(str) == 2*8+7) { + if (strlen(str) == 2 * 8 + 7) { if (string_to_bytes(str, key->Keysource, 8) != 0) { return CMDLINE_RETCODE_INVALID_PARAMETERS; } @@ -425,9 +425,9 @@ static void add_beacon(const uint8_t *beacon, uint8_t len) } unsigned int cur_beacon = received_beacons.count; received_beacons.beacon_lengths[cur_beacon] = len; - received_beacons.beacons[cur_beacon] = (char*)ns_dyn_mem_temporary_alloc(len <= 75 ? 75:len); + received_beacons.beacons[cur_beacon] = (char *)ns_dyn_mem_temporary_alloc(len <= 75 ? 75 : len); if (len != 0) { - std::memcpy(received_beacons.beacons[cur_beacon], beacon, len); + std::memcpy(received_beacons.beacons[cur_beacon], beacon, len); } ++received_beacons.count; } @@ -503,7 +503,7 @@ void mac_data_indication_handler(const mac_api_t *api, const mcps_data_ind_t *da if (data->msduLength != expected_statuses.data_ind_len) { return; } - if (strncmp((const char*)data->msdu_ptr, (const char*)expected_statuses.data_ind, expected_statuses.data_ind_len) == 0) { + if (strncmp((const char *)data->msdu_ptr, (const char *)expected_statuses.data_ind, expected_statuses.data_ind_len) == 0) { ++data_count; } else { tr_warn("Received unexpected data!"); @@ -535,13 +535,13 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi break; } case MLME_GET: { - mlme_get_conf_t *get_data = (mlme_get_conf_t*)data; + mlme_get_conf_t *get_data = (mlme_get_conf_t *)data; cmd_printf("MLME-GET.confirm\n"); if (!silent_mode) { cmd_printf("status: %hhu (%s)\n", get_data->status, mlme_status_string(get_data->status)); cmd_printf("attr: %hhu\n", get_data->attr); cmd_printf("attr_index: %hhu\n", get_data->attr_index); - cmd_printf("value_pointer: %s\n", trace_array((uint8_t*)get_data->value_pointer, get_data->value_size)); + cmd_printf("value_pointer: %s\n", trace_array((uint8_t *)get_data->value_pointer, get_data->value_size)); cmd_printf("value_size: %hhu\n", get_data->value_size); } if (get_data->status == expected_statuses.get_conf) { @@ -561,7 +561,7 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi break; } case MLME_SCAN: { - mlme_scan_conf_t *scan_data = (mlme_scan_conf_t*)data; + mlme_scan_conf_t *scan_data = (mlme_scan_conf_t *)data; cmd_printf("MLME-SCAN.confirm\n"); if (!silent_mode) { cmd_printf("status: %hhu (%s)\n", scan_data->status, mlme_status_string(scan_data->status)); @@ -596,7 +596,7 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi break; } case MLME_POLL: { - mlme_poll_conf_t *poll_data = (mlme_poll_conf_t*)data; + mlme_poll_conf_t *poll_data = (mlme_poll_conf_t *)data; cmd_printf("MLME-POLL.confirm\n"); if (!silent_mode) { cmd_printf("status: %hhu (%s)\n", poll_data->status, mlme_status_string(poll_data->status)); @@ -632,7 +632,7 @@ void mac_mlme_indication_handler(const mac_api_t *api, mlme_primitive id, const break; } case MLME_BEACON_NOTIFY: { - const mlme_beacon_ind_t *beacon_ind = (mlme_beacon_ind_t*)data; + const mlme_beacon_ind_t *beacon_ind = (mlme_beacon_ind_t *)data; cmd_printf("MLME-BEACON-NOTIFY.indication\n"); if (!silent_mode) { cmd_printf("BSN: %hhu\n", beacon_ind->BSN); @@ -640,7 +640,7 @@ void mac_mlme_indication_handler(const mac_api_t *api, mlme_primitive id, const cmd_printf("PendAddrSpec.short_address_count %u\n", beacon_ind->PendAddrSpec.short_address_count); cmd_printf("PendAddrSpec.extended_address_count %u\n", beacon_ind->PendAddrSpec.extended_address_count); cmd_printf("AddrList %s\n", trace_array(beacon_ind->AddrList, beacon_ind->PendAddrSpec.short_address_count * 2 + - beacon_ind->PendAddrSpec.extended_address_count * 8)); + beacon_ind->PendAddrSpec.extended_address_count * 8)); cmd_printf("beacon_data_length %hu\n", beacon_ind->beacon_data_length); cmd_printf("beacon_data %s\n", trace_array(beacon_ind->beacon_data, beacon_ind->beacon_data_length)); } @@ -655,7 +655,7 @@ void mac_mlme_indication_handler(const mac_api_t *api, mlme_primitive id, const } case MLME_COMM_STATUS: { cmd_printf("MLME-COMM-STATUS.indication\n"); - const mlme_comm_status_t *comm_status_ind_data = (mlme_comm_status_t*)data; + const mlme_comm_status_t *comm_status_ind_data = (mlme_comm_status_t *)data; if (!silent_mode) { cmd_printf("PANId: 0x%04X\n", comm_status_ind_data->PANId); cmd_printf("SrcAddrMode: %u\n", comm_status_ind_data->SrcAddrMode); @@ -822,7 +822,7 @@ int mac_data_command(int argc, char *argv[]) if (strlen(str) != data_req.msduLength) { return CMDLINE_RETCODE_INVALID_PARAMETERS; } - data_req.msdu = (uint8_t*)ns_dyn_mem_temporary_alloc(data_req.msduLength); + data_req.msdu = (uint8_t *)ns_dyn_mem_temporary_alloc(data_req.msduLength); if (data_req.msdu == NULL) { tr_error("Failed to allocate memory for the msdu"); return CMDLINE_RETCODE_FAIL; @@ -879,7 +879,7 @@ int mac_poll_command(int argc, char *argv[]) } } if (cmd_parameter_val(argc, argv, "--coord_address", &str)) { - int len = (poll_req.CoordAddrMode == 2 ? 2: 8); + int len = (poll_req.CoordAddrMode == 2 ? 2 : 8); if (string_to_bytes(str, poll_req.CoordAddress, len) != 0) { return CMDLINE_RETCODE_INVALID_PARAMETERS; } @@ -915,7 +915,7 @@ int mac_set_command(int argc, char *argv[]) uint16_t val_uint16 = 0; uint32_t val_uint32 = 0; uint8_t *val_ptr_array = NULL; - + cmd_printf("MLME-SET.request\n"); if (cmd_parameter_val(argc, argv, "--attr", &str)) { uint32_t attribute = strtoul(str, NULL, 16); @@ -933,7 +933,7 @@ int mac_set_command(int argc, char *argv[]) } } if (cmd_parameter_val(argc, argv, "--value_ascii", &str)) { - val_ptr_array = (uint8_t*)ns_dyn_mem_temporary_alloc(strlen(str)); + val_ptr_array = (uint8_t *)ns_dyn_mem_temporary_alloc(strlen(str)); if (val_ptr_array == NULL) { tr_error("Failed to allocate memory for MLME-SET.request"); return CMDLINE_RETCODE_FAIL; @@ -942,7 +942,7 @@ int mac_set_command(int argc, char *argv[]) set_req.value_pointer = val_ptr_array; } else if (cmd_parameter_val(argc, argv, "--value_bytes", &str)) { size_t bytes = (strlen(str) + 1) / 3; - val_ptr_array = (uint8_t*)ns_dyn_mem_temporary_alloc(bytes); + val_ptr_array = (uint8_t *)ns_dyn_mem_temporary_alloc(bytes); if (val_ptr_array == NULL) { tr_error("Failed to allocate memory for MLME-SET.request"); return CMDLINE_RETCODE_FAIL; @@ -1074,7 +1074,7 @@ static int key_config_command(int argc, char *argv[]) int lookup_index = 0, device_index = 0, usage_index = 0; if (cmd_parameter_val(argc, argv, "--key", &str)) { - if (strlen(str) == 2*16+15) { + if (strlen(str) == 2 * 16 + 15) { if (string_to_bytes(str, key_descriptor.Key, 16) != 0) { return CMDLINE_RETCODE_INVALID_PARAMETERS; } @@ -1111,7 +1111,7 @@ static int key_config_command(int argc, char *argv[]) } } if (cmd_parameter_val(argc, argv, "--lookup_data", &str)) { - if (strlen(str) == 2*9+8) { + if (strlen(str) == 2 * 9 + 8) { if (string_to_bytes(str, key_descriptor.KeyIdLookupList[lookup_index].LookupData, 9) != 0) { return CMDLINE_RETCODE_INVALID_PARAMETERS; } @@ -1226,7 +1226,7 @@ int mac_add_neighbour_command(int argc, char *argv[]) } } if (cmd_parameter_val(argc, argv, "--mac64", &str)) { - if (strlen(str) == 2*8+7) { + if (strlen(str) == 2 * 8 + 7) { if (string_to_bytes(str, neighbour.ExtAddress, 8) != 0) { return CMDLINE_RETCODE_INVALID_PARAMETERS; } @@ -1270,7 +1270,7 @@ static int filter_start(int argc, char *argv[]) } else if (strcmp(str, "fixed") == 0) { int32_t lqi, dbm; if (cmd_parameter_int(argc, argv, "--lqi_m", &lqi) && - cmd_parameter_int(argc, argv, "--dbm_m", &dbm)) { + cmd_parameter_int(argc, argv, "--dbm_m", &dbm)) { return mac_filter_start(mac_interface->parent_id, MAC_FILTER_FIXED(lqi, dbm)) < 0 ? CMDLINE_RETCODE_FAIL : CMDLINE_RETCODE_SUCCESS; } } @@ -1286,9 +1286,9 @@ static int filter_add(int argc, char *argv[]) int32_t lqi_m, lqi_add, dbm_m, dbm_add; if (cmd_parameter_int(argc, argv, "--lqi_m", &lqi_m) && - cmd_parameter_int(argc, argv, "--lqi_add", &lqi_add) && - cmd_parameter_int(argc, argv, "--dbm_m", &dbm_m) && - cmd_parameter_int(argc, argv, "--dbm_add", &dbm_add)) { + cmd_parameter_int(argc, argv, "--lqi_add", &lqi_add) && + cmd_parameter_int(argc, argv, "--dbm_m", &dbm_m) && + cmd_parameter_int(argc, argv, "--dbm_add", &dbm_add)) { } else if (cmd_parameter_val(argc, argv, "--mode", &str)) { if (strcmp(str, "allow")) { lqi_m = dbm_m = 256; @@ -1298,7 +1298,7 @@ static int filter_add(int argc, char *argv[]) } else if (strcmp(str, "fixed")) { lqi_add = dbm_add = 0; if (cmd_parameter_int(argc, argv, "--lqi_m", &lqi_m) && - cmd_parameter_int(argc, argv, "--dbm_m", &dbm_m)) { + cmd_parameter_int(argc, argv, "--dbm_m", &dbm_m)) { } else { return CMDLINE_RETCODE_INVALID_PARAMETERS; } @@ -1424,7 +1424,7 @@ int mac_config_status_command(int argc, char *argv[]) } else if (cmd_parameter_val(argc, argv, "--data_ind", &str)) { size_t len = strlen(str); ns_dyn_mem_free(expected_statuses.data_ind); - expected_statuses.data_ind = (uint8_t*)ns_dyn_mem_temporary_alloc(len); + expected_statuses.data_ind = (uint8_t *)ns_dyn_mem_temporary_alloc(len); expected_statuses.data_ind_len = len; std::memcpy(expected_statuses.data_ind, str, len); } else if (cmd_parameter_int(argc, argv, "--get", &val)) { @@ -1541,7 +1541,7 @@ int mac_analyze_ed_command(int argc, char *argv[]) return CMDLINE_RETCODE_INVALID_PARAMETERS; } } else { - return CMDLINE_RETCODE_INVALID_PARAMETERS; + return CMDLINE_RETCODE_INVALID_PARAMETERS; } if (cmd_parameter_int(argc, argv, "--above", &val)) { diff --git a/TEST_APPS/device/nanostack_mac_tester/source/util.cpp b/TEST_APPS/device/nanostack_mac_tester/source/util.cpp index 286c6d68ca..7a914a7edb 100644 --- a/TEST_APPS/device/nanostack_mac_tester/source/util.cpp +++ b/TEST_APPS/device/nanostack_mac_tester/source/util.cpp @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include "util.h" +#include "util.h" int string_to_bytes(const char *str, uint8_t *buf, int bytes) { @@ -38,40 +38,74 @@ int string_to_bytes(const char *str, uint8_t *buf, int bytes) const char *mlme_status_string(uint8_t status) { switch (status) { - case MLME_SUCCESS: return "MLME_SUCCESS"; - case MLME_BUSY_CHAN: return "MLME_BUSY_CHAN"; - case MLME_BUSY_RX: return "MLME_BUSY_RX"; - case MLME_BUSY_TX: return "MLME_BUSY_TX"; - case MLME_FORCE_TRX_OFF: return "MLME_FORCE_TRX_OFF"; - case MLME_IDLE: return "MLME_IDLE"; - case MLME_RX_ON: return "MLME_RX_ON"; - case MLME_TRX_OFF: return "MLME_TRX_OFF"; - case MLME_TX_ON: return "MLME_TX_ON"; - case MLME_COUNTER_ERROR: return "MLME_COUNTER_ERROR"; - case MLME_IMPROPER_KEY_TYPE: return "MLME_IMPROPER_KEY_TYPE"; - case MLME_IMPROPER_SECURITY_LEVEL: return "MLME_IMPROPER_SECURITY_LEVEL"; - case MLME_UNSUPPORTED_LEGACY: return "MLME_UNSUPPORTED_LEGACY"; - case MLME_UNSUPPORTED_SECURITY: return "MLME_UNSUPPORTED_SECURITY"; - case MLME_SECURITY_FAIL: return "MLME_SECURITY_FAIL"; - case MLME_FRAME_TOO_LONG: return "MLME_FRAME_TOO_LONG"; - case MLME_INVALID_HANDLE: return "MLME_INVALID_HANDLE"; - case MLME_INVALID_PARAMETER: return "MLME_INVALID_PARAMETER"; - case MLME_TX_NO_ACK: return "MLME_TX_NO_ACK"; - case MLME_NO_BEACON: return "MLME_NO_BEACON"; - case MLME_NO_DATA: return "MLME_NO_DATA"; - case MLME_NO_SHORT_ADDRESS: return "MLME_NO_SHORT_ADDRESS"; - case MLME_PAN_ID_CONFLICT: return "MLME_PAN_ID_CONFLICT"; - case MLME_TRANSACTION_EXPIRED: return "MLME_TRANSACTION_EXPIRED"; - case MLME_TRANSACTION_OVERFLOW: return "MLME_TRANSACTION_OVERFLOW"; - case MLME_UNAVAILABLE_KEY: return "MLME_UNAVAILABLE_KEY"; - case MLME_UNSUPPORTED_ATTRIBUTE: return "MLME_UNSUPPORTED_ATTRIBUTE"; - case MLME_INVALID_ADDRESS: return "MLME_INVALID_ADDRESS"; - case MLME_INVALID_INDEX: return "MLME_INVALID_INDEX"; - case MLME_LIMIT_REACHED: return "MLME_LIMIT_REACHED"; - case MLME_READ_ONLY: return "MLME_READ_ONLY"; - case MLME_SCAN_IN_PROGRESS: return "MLME_SCAN_IN_PROGRESS"; - case MLME_DATA_POLL_NOTIFICATION: return "MLME_DATA_POLL_NOTIFICATION"; - default: return NULL; + case MLME_SUCCESS: + return "MLME_SUCCESS"; + case MLME_BUSY_CHAN: + return "MLME_BUSY_CHAN"; + case MLME_BUSY_RX: + return "MLME_BUSY_RX"; + case MLME_BUSY_TX: + return "MLME_BUSY_TX"; + case MLME_FORCE_TRX_OFF: + return "MLME_FORCE_TRX_OFF"; + case MLME_IDLE: + return "MLME_IDLE"; + case MLME_RX_ON: + return "MLME_RX_ON"; + case MLME_TRX_OFF: + return "MLME_TRX_OFF"; + case MLME_TX_ON: + return "MLME_TX_ON"; + case MLME_COUNTER_ERROR: + return "MLME_COUNTER_ERROR"; + case MLME_IMPROPER_KEY_TYPE: + return "MLME_IMPROPER_KEY_TYPE"; + case MLME_IMPROPER_SECURITY_LEVEL: + return "MLME_IMPROPER_SECURITY_LEVEL"; + case MLME_UNSUPPORTED_LEGACY: + return "MLME_UNSUPPORTED_LEGACY"; + case MLME_UNSUPPORTED_SECURITY: + return "MLME_UNSUPPORTED_SECURITY"; + case MLME_SECURITY_FAIL: + return "MLME_SECURITY_FAIL"; + case MLME_FRAME_TOO_LONG: + return "MLME_FRAME_TOO_LONG"; + case MLME_INVALID_HANDLE: + return "MLME_INVALID_HANDLE"; + case MLME_INVALID_PARAMETER: + return "MLME_INVALID_PARAMETER"; + case MLME_TX_NO_ACK: + return "MLME_TX_NO_ACK"; + case MLME_NO_BEACON: + return "MLME_NO_BEACON"; + case MLME_NO_DATA: + return "MLME_NO_DATA"; + case MLME_NO_SHORT_ADDRESS: + return "MLME_NO_SHORT_ADDRESS"; + case MLME_PAN_ID_CONFLICT: + return "MLME_PAN_ID_CONFLICT"; + case MLME_TRANSACTION_EXPIRED: + return "MLME_TRANSACTION_EXPIRED"; + case MLME_TRANSACTION_OVERFLOW: + return "MLME_TRANSACTION_OVERFLOW"; + case MLME_UNAVAILABLE_KEY: + return "MLME_UNAVAILABLE_KEY"; + case MLME_UNSUPPORTED_ATTRIBUTE: + return "MLME_UNSUPPORTED_ATTRIBUTE"; + case MLME_INVALID_ADDRESS: + return "MLME_INVALID_ADDRESS"; + case MLME_INVALID_INDEX: + return "MLME_INVALID_INDEX"; + case MLME_LIMIT_REACHED: + return "MLME_LIMIT_REACHED"; + case MLME_READ_ONLY: + return "MLME_READ_ONLY"; + case MLME_SCAN_IN_PROGRESS: + return "MLME_SCAN_IN_PROGRESS"; + case MLME_DATA_POLL_NOTIFICATION: + return "MLME_DATA_POLL_NOTIFICATION"; + default: + return NULL; } }