From 2f41803ef6423ddadaaca97a34122e00c84e89fe Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Wed, 29 Jun 2022 10:04:13 +0800 Subject: [PATCH 1/2] Remove the tail space from all source code Signed-off-by: Xiang Xiao Change-Id: Ic71968d27474b8f050502af0cf0e91862678d4b6 --- example/demo.c | 8 ++++---- example/unsolicited.c | 2 +- src/cat.h | 6 +++--- tests/test_return_read.c | 2 +- tests/test_return_run.c | 2 +- tests/test_return_test.c | 2 +- tests/test_return_write.c | 2 +- tests/test_run.c | 2 +- tests/test_search_cmd.c | 2 +- tests/test_shortcuts.c | 2 +- tests/test_unsolicited_test.c | 2 +- tests/test_write.c | 4 ++-- tests/test_write_hex_buffer.c | 2 +- tests/test_write_hex_range.c | 10 +++++----- tests/test_write_int_range.c | 6 +++--- tests/test_write_string_buffer.c | 4 ++-- tests/test_write_uint_range.c | 6 +++--- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/example/demo.c b/example/demo.c index 3ea778b..d2005cc 100644 --- a/example/demo.c +++ b/example/demo.c @@ -73,7 +73,7 @@ static int bytesbuf_write(const struct cat_variable *var, size_t write_size) { int i = 0; - printf("bytes_buf variable updated %lu bytes internally to: ", write_size); + printf("bytes_buf variable updated %lu bytes internally to: ", write_size); for (i = 0; i < sizeof(bytes_buf); i++) printf("%02X", bytes_buf[i]); printf("\n"); @@ -84,7 +84,7 @@ static int bytesbuf_write(const struct cat_variable *var, size_t write_size) static int go_write(const struct cat_command *cmd, const uint8_t *data, const size_t data_size, const size_t args_num) { int i = 0; - + printf("<%s>: x=%d y=%d msg=%s @ speed=%d\n", cmd->name, *(uint8_t*)(cmd->var[0].data), @@ -92,7 +92,7 @@ static int go_write(const struct cat_command *cmd, const uint8_t *data, const si msg, speed ); - + printf(": "); for (i = 0; i < sizeof(bytes_buf); i++) printf("%02X", bytes_buf[i]); @@ -169,7 +169,7 @@ static struct cat_variable set_vars[] = { .data = &adr, .data_size = sizeof(adr), .write = adr_write, - .name = "address" + .name = "address" }, { .type = CAT_VAR_BUF_HEX, diff --git a/example/unsolicited.c b/example/unsolicited.c index 0ce2098..d253d4a 100644 --- a/example/unsolicited.c +++ b/example/unsolicited.c @@ -125,7 +125,7 @@ static cat_return_state scan_read(const struct cat_command *cmd, uint8_t *data, scan_index++; if (scan_index > max) return CAT_RETURN_STATE_HOLD_EXIT_OK; - + load_scan_results(scan_index); cat_trigger_unsolicited_read(&at, &scan_cmd); diff --git a/src/cat.h b/src/cat.h index be6b027..f05bde5 100644 --- a/src/cat.h +++ b/src/cat.h @@ -291,11 +291,11 @@ typedef enum { CAT_UNSOLICITED_STATE_READ_LOOP, CAT_UNSOLICITED_STATE_TEST_LOOP, CAT_UNSOLICITED_STATE_FLUSH_IO_WRITE_WAIT, - CAT_UNSOLICITED_STATE_FLUSH_IO_WRITE, + CAT_UNSOLICITED_STATE_FLUSH_IO_WRITE, CAT_UNSOLICITED_STATE_AFTER_FLUSH_RESET, CAT_UNSOLICITED_STATE_AFTER_FLUSH_OK, CAT_UNSOLICITED_STATE_AFTER_FLUSH_FORMAT_READ_ARGS, - CAT_UNSOLICITED_STATE_AFTER_FLUSH_FORMAT_TEST_ARGS, + CAT_UNSOLICITED_STATE_AFTER_FLUSH_FORMAT_TEST_ARGS, } cat_unsolicited_state; /* enum type with fsm type */ @@ -318,7 +318,7 @@ struct cat_unsolicited_fsm { char const *write_buf; /* working buffer pointer used for asynch writing to io */ int write_state; /* before, data, after flush io write state */ cat_unsolicited_state write_state_after; /* parser state to set after flush io write */ - + struct cat_unsolicited_cmd unsolicited_cmd_buffer[CAT_UNSOLICITED_CMD_BUFFER_SIZE]; /* buffer with unsolicited commands used to unsolicited event */ size_t unsolicited_cmd_buffer_tail; /* tail index of unsolicited cmd buffer */ size_t unsolicited_cmd_buffer_head; /* head index of unsolicited cmd buffer */ diff --git a/tests/test_return_read.c b/tests/test_return_read.c index fc8089b..65102f3 100644 --- a/tests/test_return_read.c +++ b/tests/test_return_read.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+CMD=1\n\n+CMD=2\n\nOK\n") == 0); assert(strcmp(cmd_results, " read:+CMD read:+CMD") == 0); - + ret = CAT_RETURN_STATE_NEXT; prepare_input(test_case_1); while (cat_service(&at) != 0) {}; diff --git a/tests/test_return_run.c b/tests/test_return_run.c index 2403b1b..63cc620 100644 --- a/tests/test_return_run.c +++ b/tests/test_return_run.c @@ -215,7 +215,7 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+CMD=2\n\n+CMD=3\n\ntest\n\nERROR\n") == 0); assert(strcmp(cmd_results, " run:+CMD read:+CMD read:+CMD read:+CMD read:+CMD") == 0); assert(var_x == 6); - + ret = CAT_RETURN_STATE_HOLD_EXIT_ERROR; prepare_input(test_case_1); while (cat_service(&at) != 0) {}; diff --git a/tests/test_return_test.c b/tests/test_return_test.c index e16f546..ac30525 100644 --- a/tests/test_return_test.c +++ b/tests/test_return_test.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+CMD=\n\n+CMD=\n\nOK\n") == 0); assert(strcmp(cmd_results, " test:+CMD test:+CMD") == 0); - + ret = CAT_RETURN_STATE_NEXT; prepare_input(test_case_1); while (cat_service(&at) != 0) {}; diff --git a/tests/test_return_write.c b/tests/test_return_write.c index 8375fd0..cde0e61 100644 --- a/tests/test_return_write.c +++ b/tests/test_return_write.c @@ -215,7 +215,7 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+CMD=2\n\n+CMD=3\n\ntest\n\nERROR\n") == 0); assert(strcmp(cmd_results, " write:+CMD read:+CMD read:+CMD read:+CMD read:+CMD") == 0); assert(var_x == 6); - + ret = CAT_RETURN_STATE_HOLD_EXIT_ERROR; prepare_input(test_case_1); while (cat_service(&at) != 0) {}; diff --git a/tests/test_run.c b/tests/test_run.c index 6b02e3a..e4d9eaf 100644 --- a/tests/test_run.c +++ b/tests/test_run.c @@ -152,6 +152,6 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nOK\n\nERROR\n\r\nOK\r\n\nOK\n\nERROR\n\nOK\n\nOK\n\nERROR\n\nERROR\n\nERROR\n\nERROR\n") == 0); assert(strcmp(run_results, " A:A AP:AP +TEST:+TEST +TEST:+TEST FORCE:FORCE FORCE:FORCE") == 0); - + return 0; } diff --git a/tests/test_search_cmd.c b/tests/test_search_cmd.c index 6679911..d63b3f0 100644 --- a/tests/test_search_cmd.c +++ b/tests/test_search_cmd.c @@ -106,7 +106,7 @@ static struct cat_command_group cmd_group1 = { static struct cat_command_group cmd_group2 = { .name = "ext", - + .cmd = cmds2, .cmd_num = sizeof(cmds2) / sizeof(cmds2[0]), }; diff --git a/tests/test_shortcuts.c b/tests/test_shortcuts.c index 4a2bc6f..b64e22e 100644 --- a/tests/test_shortcuts.c +++ b/tests/test_shortcuts.c @@ -144,6 +144,6 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nOK\n\nERROR\n\nERROR\n\nERROR\n\nERROR\n\nOK\n\nERROR\n\nOK\n\nOK\n\nOK\n\nOK\n\nOK\n\nOK\n\nOK\n") == 0); assert(strcmp(run_results, "+TEST +TEST_A +TEST_B +ONE +ONE +ONE +TWO +TWO ") == 0); - + return 0; } diff --git a/tests/test_unsolicited_test.c b/tests/test_unsolicited_test.c index 7e7c475..e4374ce 100644 --- a/tests/test_unsolicited_test.c +++ b/tests/test_unsolicited_test.c @@ -181,7 +181,7 @@ int main(int argc, char **argv) assert(s == CAT_STATUS_ERROR_BUFFER_FULL); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\n+U1CMD=\n\n+CMD=\n\n+U2CMD=\n\nOK\n") == 0); assert(strcmp(read_results, " test:+U1CMD test:+CMD test:+U2CMD") == 0); diff --git a/tests/test_write.c b/tests/test_write.c index 2388b44..8e1fdcc 100644 --- a/tests/test_write.c +++ b/tests/test_write.c @@ -49,7 +49,7 @@ static int a_write(const struct cat_command *cmd, const uint8_t *data, const siz { strcat(write_results, " A:"); strncat(write_results, data, data_size); - + assert(args_num == 0); return 0; @@ -157,7 +157,7 @@ int main(int argc, char **argv) prepare_input(test_case_1); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nOK\n\nERROR\n\nERROR\n\r\nOK\r\n\nOK\n\nERROR\n\r\nOK\r\n\nERROR\n\nERROR\n\nERROR\n\r\nERROR\r\n\nOK\n") == 0); assert(strcmp(run_results, " A_A") == 0); assert(strcmp(write_results, " A:123 A: AP:1122 +TEST:456 +TEST:789") == 0); diff --git a/tests/test_write_hex_buffer.c b/tests/test_write_hex_buffer.c index 68ab94e..4239e62 100644 --- a/tests/test_write_hex_buffer.c +++ b/tests/test_write_hex_buffer.c @@ -140,7 +140,7 @@ int main(int argc, char **argv) prepare_input(test_case_1); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nERROR\n\nOK\n\nOK\n") == 0); assert(strcmp(write_results, " CMD:aa CMD:12345678 CMD:ffAA") == 0); diff --git a/tests/test_write_hex_range.c b/tests/test_write_hex_range.c index da40feb..576a6e6 100644 --- a/tests/test_write_hex_range.c +++ b/tests/test_write_hex_range.c @@ -51,14 +51,14 @@ static int cmd_write(const struct cat_command *cmd, const uint8_t *data, const s static int var1_write(const struct cat_variable *var, size_t write_size) { assert(write_size == 1); - var1b = *(uint8_t*)(var->data); + var1b = *(uint8_t*)(var->data); return 0; } static int var2_write(const struct cat_variable *var, size_t write_size) { assert(write_size == 2); - var2b = *(uint16_t*)(var->data); + var2b = *(uint16_t*)(var->data); return 0; } @@ -171,7 +171,7 @@ int main(int argc, char **argv) prepare_input(test_case_1); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0x0 CMD:0x01 CMD:0x0ff") == 0); @@ -184,7 +184,7 @@ int main(int argc, char **argv) prepare_input(test_case_2); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0x1,0x00 CMD:0x2,0xFFf CMD:0x3,0xFFFF") == 0); @@ -197,7 +197,7 @@ int main(int argc, char **argv) prepare_input(test_case_3); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0x0,0x0,0x0000000000000 CMD:0x0,0x0,0x1 CMD:0x0,0x0,0xffffFFFF") == 0); diff --git a/tests/test_write_int_range.c b/tests/test_write_int_range.c index 6f99fee..4e2e3a9 100644 --- a/tests/test_write_int_range.c +++ b/tests/test_write_int_range.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) prepare_input(test_case_1); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nOK\n\nERROR\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:-128 CMD:127") == 0); @@ -184,7 +184,7 @@ int main(int argc, char **argv) prepare_input(test_case_2); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nOK\n\nERROR\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:-128,-32768 CMD:-128,32767") == 0); @@ -197,7 +197,7 @@ int main(int argc, char **argv) prepare_input(test_case_3); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nOK\n\nERROR\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0,0,-2147483648 CMD:1,1,2147483647") == 0); diff --git a/tests/test_write_string_buffer.c b/tests/test_write_string_buffer.c index e247655..047ec35 100644 --- a/tests/test_write_string_buffer.c +++ b/tests/test_write_string_buffer.c @@ -140,7 +140,7 @@ int main(int argc, char **argv) prepare_input(test_case_1); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nERROR\n\nOK\n\r\nOK\r\n") == 0); assert(strcmp(write_results, " CMD:\"\\\"abcd\\\"\" CMD:\"1122334\" CMD:\"t\"") == 0); @@ -153,7 +153,7 @@ int main(int argc, char **argv) prepare_input(test_case_2); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nOK\n") == 0); assert(strcmp(write_results, " CMD:\"\" CMD:\"\\\\\\\\\" CMD:\"r1\\nr2\\n\"") == 0); diff --git a/tests/test_write_uint_range.c b/tests/test_write_uint_range.c index 6e080ea..9161e73 100644 --- a/tests/test_write_uint_range.c +++ b/tests/test_write_uint_range.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) prepare_input(test_case_1); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0 CMD:255") == 0); @@ -184,7 +184,7 @@ int main(int argc, char **argv) prepare_input(test_case_2); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0,0 CMD:0,65535") == 0); @@ -197,7 +197,7 @@ int main(int argc, char **argv) prepare_input(test_case_3); while (cat_service(&at) != 0) {}; - + assert(strcmp(ack_results, "\nERROR\n\nOK\n\nOK\n\nERROR\n") == 0); assert(strcmp(write_results, " CMD:0,0,0 CMD:1,1,4294967295") == 0); From 50eb4ae940d472ab965a4d70f59a399e67579688 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 30 Jun 2022 01:03:37 +0800 Subject: [PATCH 2/2] Change tab to space Signed-off-by: Xiang Xiao Change-Id: I63d5bf6d40003b8f4da8fa77dbe3e6df46c4425b --- example/basic.c | 6 +++--- example/demo.c | 6 +++--- example/unsolicited.c | 4 ++-- tests/test_cmd_list.c | 6 +++--- tests/test_hold_state.c | 4 ++-- tests/test_mutex.c | 6 +++--- tests/test_order.c | 6 +++--- tests/test_parse.c | 6 +++--- tests/test_read.c | 6 +++--- tests/test_read_args.c | 6 +++--- tests/test_return_read.c | 4 ++-- tests/test_return_run.c | 4 ++-- tests/test_return_test.c | 4 ++-- tests/test_return_write.c | 4 ++-- tests/test_run.c | 6 +++--- tests/test_search_cmd.c | 6 +++--- tests/test_shortcuts.c | 6 +++--- tests/test_test.c | 6 +++--- tests/test_test_args.c | 6 +++--- tests/test_test_only.c | 6 +++--- tests/test_unsolicited_read.c | 4 ++-- tests/test_unsolicited_read_buffer.c | 4 ++-- tests/test_unsolicited_read_stress.c | 4 ++-- tests/test_unsolicited_test.c | 4 ++-- tests/test_var_access.c | 6 +++--- tests/test_write.c | 6 +++--- tests/test_write_hex_buffer.c | 6 +++--- tests/test_write_hex_range.c | 6 +++--- tests/test_write_int_range.c | 6 +++--- tests/test_write_parse.c | 6 +++--- tests/test_write_string_buffer.c | 6 +++--- tests/test_write_uint_range.c | 6 +++--- 32 files changed, 86 insertions(+), 86 deletions(-) diff --git a/example/basic.c b/example/basic.c index 5f0c865..965451e 100644 --- a/example/basic.c +++ b/example/basic.c @@ -146,10 +146,10 @@ static struct cat_io_interface iface = { int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; /* initializing */ - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); /* main loop with exit code conditions */ while ((cat_service(&at) != 0) && (quit_flag == 0)) {}; @@ -157,5 +157,5 @@ int main(int argc, char **argv) /* goodbye message */ printf("Bye!\n"); - return 0; + return 0; } diff --git a/example/demo.c b/example/demo.c index d2005cc..53d9277 100644 --- a/example/demo.c +++ b/example/demo.c @@ -248,13 +248,13 @@ static struct cat_io_interface iface = { int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); while ((cat_service(&at) != 0) && (quit_flag == 0)) {}; printf("Bye!\n"); - return 0; + return 0; } diff --git a/example/unsolicited.c b/example/unsolicited.c index d253d4a..e0410db 100644 --- a/example/unsolicited.c +++ b/example/unsolicited.c @@ -239,7 +239,7 @@ static struct cat_io_interface iface = { int main(int argc, char **argv) { /* initializing */ - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); /* main loop with exit code conditions */ while ((cat_service(&at) != 0) && (quit_flag == 0)) {}; @@ -247,5 +247,5 @@ int main(int argc, char **argv) /* goodbye message */ printf("Bye!\n"); - return 0; + return 0; } diff --git a/tests/test_cmd_list.c b/tests/test_cmd_list.c index 214b732..23081a5 100644 --- a/tests/test_cmd_list.c +++ b/tests/test_cmd_list.c @@ -327,14 +327,14 @@ static void print_raw_text(char *p) int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input("\nAT#HELP\n"); while (cat_service(&at) != 0) {}; assert(strcmp(ack_results, "\nAT+V1?\nAT+V1=\nAT+V1=?\n\nAT+V1RO?\nAT+V1RO=?\n\nAT+V1RW=\nAT+V1RW=?\n\nAT+V11?\nAT+V11=\nAT+V11=?\n\nAT+V11RO?\nAT+V11RO=\nAT+V11RO=?\n\nAT+V11WO?\nAT+V11WO=\nAT+V11WO=?\n\nAT+V2?\nAT+V2=\nAT+V2=?\n\nAT+V3?\nAT+V3=\nAT+V3=?\n\nAT+V4?\nAT+V4=\nAT+V4=?\n\nAT+V5\nAT+V5?\nAT+V5=\nAT+V5=?\n\nAT+S2=\n\nAT+S3?\nAT+S3=\n\nAT+S4?\nAT+S4=\nAT+S4=?\n\nAT+S5\nAT+S5?\nAT+S5=\nAT+S5=?\n\nAT+T1=?\n\nAT#HELP\n\nOK\n") == 0); - return 0; + return 0; } diff --git a/tests/test_hold_state.c b/tests/test_hold_state.c index da17556..23746bc 100644 --- a/tests/test_hold_state.c +++ b/tests/test_hold_state.c @@ -216,7 +216,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -225,5 +225,5 @@ int main(int argc, char **argv) assert(strcmp(cmd_results, " write:+CMD read1:+U1CMD read1:+U1CMD read1:+U1CMD write:+CMD read2:+U2CMD read2:+U2CMD read2:+U2CMD read2:+U2CMD") == 0); assert(strcmp(var_read_results, " var_read:U1 var_read:U1 var_read:U1 var_read:U2 var_read:U2 var_read:U2 var_read:U2") == 0); - return 0; + return 0; } diff --git a/tests/test_mutex.c b/tests/test_mutex.c index 2cc07de..315158b 100644 --- a/tests/test_mutex.c +++ b/tests/test_mutex.c @@ -150,9 +150,9 @@ static const char test_case_1[] = "\nAT\nAT+test\n"; int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, &mutex); + cat_init(&at, &desc, &iface, &mutex); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -181,5 +181,5 @@ int main(int argc, char **argv) assert(cat_service(&at) == CAT_STATUS_OK); assert(cat_is_busy(&at) == CAT_STATUS_OK); - return 0; + return 0; } diff --git a/tests/test_order.c b/tests/test_order.c index f47fb2a..bc149d1 100644 --- a/tests/test_order.c +++ b/tests/test_order.c @@ -193,9 +193,9 @@ static const char test_case_1[] = "\nATE\n\nATE0\n\nATE1\n"; int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc_1, &iface, NULL); + cat_init(&at, &desc_1, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -219,5 +219,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nOK\n\nOK\n\nOK\n") == 0); assert(strcmp(run_results, " E:E E0:E0 E1:E1") == 0); - return 0; + return 0; } diff --git a/tests/test_parse.c b/tests/test_parse.c index 50e803d..5da34a9 100644 --- a/tests/test_parse.c +++ b/tests/test_parse.c @@ -132,9 +132,9 @@ static const char test_case_1[] = "\nsa\rAT\n\r\nAT\nAT+\n\nATA\r\natap\naaaattt int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -191,5 +191,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nERROR\n\nERROR\n\nERROR\n") == 0); assert(strcmp(run_results, "") == 0); - return 0; + return 0; } diff --git a/tests/test_read.c b/tests/test_read.c index 9e21eae..4d3dcf5 100644 --- a/tests/test_read.c +++ b/tests/test_read.c @@ -150,9 +150,9 @@ static const char test_case_1[] = "\nAT\r\nAT+\nAT+?\nATA?\r\nATAP\nATAP?\nATAPA int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -161,5 +161,5 @@ int main(int argc, char **argv) assert(strcmp(run_results, " A_A") == 0); assert(strcmp(read_results, " A:A AP:AP +TEST:+TEST +TEST:+TEST") == 0); - return 0; + return 0; } diff --git a/tests/test_read_args.c b/tests/test_read_args.c index cb390d4..ce10bad 100644 --- a/tests/test_read_args.c +++ b/tests/test_read_args.c @@ -196,9 +196,9 @@ static const char test_case_2[] = "\nAT+TEST?\n"; int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -212,5 +212,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+TEST=test\n\nOK\n") == 0); assert(common_cntr == 7); - return 0; + return 0; } diff --git a/tests/test_return_read.c b/tests/test_return_read.c index 65102f3..63f7882 100644 --- a/tests/test_return_read.c +++ b/tests/test_return_read.c @@ -149,7 +149,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); ret = CAT_RETURN_STATE_ERROR; prepare_input(test_case_1); @@ -202,5 +202,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+CMD=1\n\n+CMD=2\n\ntest\n\nERROR\n") == 0); assert(strcmp(cmd_results, " read:+CMD read:+CMD read:+CMD read:+CMD read:+CMD") == 0); - return 0; + return 0; } diff --git a/tests/test_return_run.c b/tests/test_return_run.c index 63cc620..572763b 100644 --- a/tests/test_return_run.c +++ b/tests/test_return_run.c @@ -156,7 +156,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); ret = CAT_RETURN_STATE_ERROR; prepare_input(test_case_1); @@ -232,5 +232,5 @@ int main(int argc, char **argv) assert(strcmp(cmd_results, " run:+CMD") == 0); assert(var_x == 2); - return 0; + return 0; } diff --git a/tests/test_return_test.c b/tests/test_return_test.c index ac30525..d0eb287 100644 --- a/tests/test_return_test.c +++ b/tests/test_return_test.c @@ -149,7 +149,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); ret = CAT_RETURN_STATE_ERROR; prepare_input(test_case_1); @@ -202,5 +202,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+CMD=\n\n+CMD=\n\ntest\n\nERROR\n") == 0); assert(strcmp(cmd_results, " test:+CMD test:+CMD test:+CMD test:+CMD test:+CMD") == 0); - return 0; + return 0; } diff --git a/tests/test_return_write.c b/tests/test_return_write.c index cde0e61..9d68e30 100644 --- a/tests/test_return_write.c +++ b/tests/test_return_write.c @@ -156,7 +156,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); ret = CAT_RETURN_STATE_ERROR; prepare_input(test_case_1); @@ -232,5 +232,5 @@ int main(int argc, char **argv) assert(strcmp(cmd_results, " write:+CMD") == 0); assert(var_x == 2); - return 0; + return 0; } diff --git a/tests/test_run.c b/tests/test_run.c index e4d9eaf..712656c 100644 --- a/tests/test_run.c +++ b/tests/test_run.c @@ -143,9 +143,9 @@ static const char test_case_1[] = "\nAT\nAT+\nATA\r\nATAP\nATAPA\nAT+TEST\nAT+te int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -153,5 +153,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nOK\n\nERROR\n\r\nOK\r\n\nOK\n\nERROR\n\nOK\n\nOK\n\nERROR\n\nERROR\n\nERROR\n\nERROR\n") == 0); assert(strcmp(run_results, " A:A AP:AP +TEST:+TEST +TEST:+TEST FORCE:FORCE FORCE:FORCE") == 0); - return 0; + return 0; } diff --git a/tests/test_search_cmd.c b/tests/test_search_cmd.c index d63b3f0..fc50016 100644 --- a/tests/test_search_cmd.c +++ b/tests/test_search_cmd.c @@ -141,12 +141,12 @@ static struct cat_io_interface iface = { int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; struct cat_command const *cmd; struct cat_command_group const *cmd_group; struct cat_variable const *var; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); cmd = cat_search_command_by_name(&at, "A"); assert(cmd == NULL); @@ -220,5 +220,5 @@ int main(int argc, char **argv) var = cat_search_variable_by_name(&at, &cmds2[0], "var_apx2_1"); assert(var == NULL); - return 0; + return 0; } diff --git a/tests/test_shortcuts.c b/tests/test_shortcuts.c index b64e22e..2af8343 100644 --- a/tests/test_shortcuts.c +++ b/tests/test_shortcuts.c @@ -135,9 +135,9 @@ static void print_raw_text(char *p) int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -145,5 +145,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nOK\n\nERROR\n\nERROR\n\nERROR\n\nERROR\n\nOK\n\nERROR\n\nOK\n\nOK\n\nOK\n\nOK\n\nOK\n\nOK\n\nOK\n") == 0); assert(strcmp(run_results, "+TEST +TEST_A +TEST_B +ONE +ONE +ONE +TWO +TWO ") == 0); - return 0; + return 0; } diff --git a/tests/test_test.c b/tests/test_test.c index 204351c..02ee4d6 100644 --- a/tests/test_test.c +++ b/tests/test_test.c @@ -169,9 +169,9 @@ static const char test_case_1[] = "\nAT\r\nAT\nATAP=?\nATAP=?a\nATAP=a\nATAPW=?\ int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -179,5 +179,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\r\nOK\r\n\nOK\n\nAP=\n\nOK\n\nERROR\n\nOK\n\nOK\n\nERROR\n\nA=A-val\n\nOK\n\nERROR\n") == 0); assert(strcmp(test_results, " AP:AP AP_W:AP APW:APW +TEST:+TEST A:A") == 0); - return 0; + return 0; } diff --git a/tests/test_test_args.c b/tests/test_test_args.c index 54aee2e..b2fd381 100644 --- a/tests/test_test_args.c +++ b/tests/test_test_args.c @@ -426,9 +426,9 @@ static const char test_case_3[] = "\nAT+ZZ=?\nAT+ZZ2=?\nAT+ZZ3=?\r\n"; int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -455,5 +455,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\ntest1\n\nOK\n\ntest1\n\nOK\n\r\n+ZZ3=\r\nzz3_desctest2\r\n\r\nOK\r\n") == 0); - return 0; + return 0; } diff --git a/tests/test_test_only.c b/tests/test_test_only.c index b102d6f..f4265ff 100644 --- a/tests/test_test_only.c +++ b/tests/test_test_only.c @@ -153,9 +153,9 @@ static const char test_case_2[] = "\nATAP2=?\n\nATAP2?\n\nATAP2=1\n\nATAP2\n"; int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -169,5 +169,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\nap_test\n\nOK\n\nap_read\n\nOK\n\nOK\n\nOK\n") == 0); assert(strcmp(cmd_results, " test:AP2 read:AP2 write:AP2 run:AP2") == 0); - return 0; + return 0; } diff --git a/tests/test_unsolicited_read.c b/tests/test_unsolicited_read.c index b0d976e..ac98fb6 100644 --- a/tests/test_unsolicited_read.c +++ b/tests/test_unsolicited_read.c @@ -180,7 +180,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); @@ -199,5 +199,5 @@ int main(int argc, char **argv) assert(strcmp(read_results, " read:+U1CMD read:+CMD read:+U2CMD") == 0); assert(strcmp(var_read_results, " var_read:U1 var_read:X var_read:U2") == 0); - return 0; + return 0; } diff --git a/tests/test_unsolicited_read_buffer.c b/tests/test_unsolicited_read_buffer.c index ee2377f..4e9d2d1 100644 --- a/tests/test_unsolicited_read_buffer.c +++ b/tests/test_unsolicited_read_buffer.c @@ -180,7 +180,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); @@ -234,5 +234,5 @@ int main(int argc, char **argv) s = cat_is_unsolicited_buffer_full(&at); assert(s == CAT_STATUS_OK); - return 0; + return 0; } diff --git a/tests/test_unsolicited_read_stress.c b/tests/test_unsolicited_read_stress.c index 19f53a9..e7dd829 100644 --- a/tests/test_unsolicited_read_stress.c +++ b/tests/test_unsolicited_read_stress.c @@ -163,7 +163,7 @@ int main(int argc, char **argv) int events = 4; struct cat_command const *cmd; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); @@ -207,5 +207,5 @@ int main(int argc, char **argv) assert(strcmp(read_results, " read:+UCMD read:+CMD read:+UCMD read:+UCMD read:+UCMD") == 0); assert(strcmp(var_read_results, " var_read:U1 var_read:X var_read:U1 var_read:U1 var_read:U1") == 0); - return 0; + return 0; } diff --git a/tests/test_unsolicited_test.c b/tests/test_unsolicited_test.c index e4374ce..06e509c 100644 --- a/tests/test_unsolicited_test.c +++ b/tests/test_unsolicited_test.c @@ -167,7 +167,7 @@ int main(int argc, char **argv) { cat_status s; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); @@ -185,5 +185,5 @@ int main(int argc, char **argv) assert(strcmp(ack_results, "\n+U1CMD=\n\n+CMD=\n\n+U2CMD=\n\nOK\n") == 0); assert(strcmp(read_results, " test:+U1CMD test:+CMD test:+U2CMD") == 0); - return 0; + return 0; } diff --git a/tests/test_var_access.c b/tests/test_var_access.c index 2d062de..bad8600 100644 --- a/tests/test_var_access.c +++ b/tests/test_var_access.c @@ -414,9 +414,9 @@ static void print_raw_text(char *p) int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input("\nAT#HELP\n"); while (cat_service(&at) != 0) {}; @@ -541,5 +541,5 @@ int main(int argc, char **argv) assert(var_buf[3] == 0x04); assert(strcmp(var_string, "abc") == 0); - return 0; + return 0; } diff --git a/tests/test_write.c b/tests/test_write.c index 8e1fdcc..c40bf91 100644 --- a/tests/test_write.c +++ b/tests/test_write.c @@ -151,9 +151,9 @@ static const char test_case_1[] = "\nAT\nAT+\nAT+?\nATA=123\r\nATA=\nATAP?\nATAP int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -162,5 +162,5 @@ int main(int argc, char **argv) assert(strcmp(run_results, " A_A") == 0); assert(strcmp(write_results, " A:123 A: AP:1122 +TEST:456 +TEST:789") == 0); - return 0; + return 0; } diff --git a/tests/test_write_hex_buffer.c b/tests/test_write_hex_buffer.c index 4239e62..eb927c0 100644 --- a/tests/test_write_hex_buffer.c +++ b/tests/test_write_hex_buffer.c @@ -134,9 +134,9 @@ static const char test_case_2[] = "\nAT+SET=0x11\nAT+SET=11\nAT+SET=-1\nAT+SET=8 int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -170,5 +170,5 @@ int main(int argc, char **argv) assert(var_write_size[2] == 2); assert(var_write_size[3] == 0); - return 0; + return 0; } diff --git a/tests/test_write_hex_range.c b/tests/test_write_hex_range.c index 576a6e6..9b28931 100644 --- a/tests/test_write_hex_range.c +++ b/tests/test_write_hex_range.c @@ -165,9 +165,9 @@ static const char test_case_3[] = "\nAT+SET=0x0,0x0,0\nAT+SET=0x0,0x0,0x00000000 int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -208,5 +208,5 @@ int main(int argc, char **argv) assert(var3 == 0xFFFFFFFF); assert(var3b == var3); - return 0; + return 0; } diff --git a/tests/test_write_int_range.c b/tests/test_write_int_range.c index 4e2e3a9..183a427 100644 --- a/tests/test_write_int_range.c +++ b/tests/test_write_int_range.c @@ -165,9 +165,9 @@ static const char test_case_3[] = "\nAT+SET=0,0,-2147483648\nAT+SET=0,0,-2147483 int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -208,5 +208,5 @@ int main(int argc, char **argv) assert(var3 == 2147483647); assert(var3b == var3); - return 0; + return 0; } diff --git a/tests/test_write_parse.c b/tests/test_write_parse.c index 3d6eda6..2ad9a68 100644 --- a/tests/test_write_parse.c +++ b/tests/test_write_parse.c @@ -187,9 +187,9 @@ static const char test_case_3[] = "\nAT+SETALL=-11,-22,-33\nAT+SETALL=-1,-2,-3\n int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -230,5 +230,5 @@ int main(int argc, char **argv) assert(var2b == -2); assert(var3b == -3); - return 0; + return 0; } diff --git a/tests/test_write_string_buffer.c b/tests/test_write_string_buffer.c index 047ec35..cb951fe 100644 --- a/tests/test_write_string_buffer.c +++ b/tests/test_write_string_buffer.c @@ -134,9 +134,9 @@ static const char test_case_2[] = "\nAT+SET=\"12345678\"\nAT+SET=\"\"\nAT+SET=\" int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -164,5 +164,5 @@ int main(int argc, char **argv) assert(var_write_size[2] == 6); assert(var_write_size[3] == 0); - return 0; + return 0; } diff --git a/tests/test_write_uint_range.c b/tests/test_write_uint_range.c index 9161e73..0e064ca 100644 --- a/tests/test_write_uint_range.c +++ b/tests/test_write_uint_range.c @@ -165,9 +165,9 @@ static const char test_case_3[] = "\nAT+SET=0,0,-1\nAT+SET=0,0,0\nAT+SET=1,1,429 int main(int argc, char **argv) { - struct cat_object at; + struct cat_object at; - cat_init(&at, &desc, &iface, NULL); + cat_init(&at, &desc, &iface, NULL); prepare_input(test_case_1); while (cat_service(&at) != 0) {}; @@ -208,5 +208,5 @@ int main(int argc, char **argv) assert(var3 == 4294967295); assert(var3b == var3); - return 0; + return 0; }