From 469dbf58ac1661f529544c8f72de71b3f3ed523c Mon Sep 17 00:00:00 2001 From: coreglitch Date: Sun, 11 Oct 2020 17:03:05 +0600 Subject: [PATCH] Fix linter path and lint code (#170) * chage syntax checker path * fix syntax --- applications/examples/fatfs_list.c | 1 - applications/tests/minunit.h | 814 +++++++++++++++-------------- core/app.cpp | 10 +- core/furi_ac.c | 2 +- docker/syntax_check.sh | 6 +- 5 files changed, 437 insertions(+), 396 deletions(-) diff --git a/applications/examples/fatfs_list.c b/applications/examples/fatfs_list.c index 8b1ea3c8..ef8fc816 100644 --- a/applications/examples/fatfs_list.c +++ b/applications/examples/fatfs_list.c @@ -105,7 +105,6 @@ void fatfs_list(void* p) { while(1) { if(xQueueReceive(event_queue, (void*)&event, portMAX_DELAY)) { - // process buttons event if(event.type == EventTypeKey) { // button pressed diff --git a/applications/tests/minunit.h b/applications/tests/minunit.h index c90a7454..e7caee40 100644 --- a/applications/tests/minunit.h +++ b/applications/tests/minunit.h @@ -24,17 +24,18 @@ #define MINUNIT_MINUNIT_H #ifdef __cplusplus - extern "C" { +extern "C" { #endif #if defined(_WIN32) #include #if defined(_MSC_VER) && _MSC_VER < 1900 - #define snprintf _snprintf - #define __func__ __FUNCTION__ +#define snprintf _snprintf +#define __func__ __FUNCTION__ #endif -#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__)) +#elif defined(__unix__) || defined(__unix) || defined(unix) || \ + (defined(__APPLE__) && defined(__MACH__)) /* Change POSIX C SOURCE version for pure c99 compilers */ #if !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 200112L @@ -42,9 +43,9 @@ #define _POSIX_C_SOURCE 200112L #endif -#include /* POSIX flags */ -#include /* clock_gettime(), time() */ -#include /* gethrtime(), gettimeofday() */ +#include /* POSIX flags */ +#include /* clock_gettime(), time() */ +#include /* gethrtime(), gettimeofday() */ #include #include #include @@ -82,314 +83,366 @@ static void (*minunit_teardown)(void) = NULL; #define MU_TEST(method_name) static void method_name(void) #define MU_TEST_SUITE(suite_name) static void suite_name(void) -#define MU__SAFE_BLOCK(block) do {\ - block\ -} while(0) +#define MU__SAFE_BLOCK(block) \ + do { \ + block \ + } while(0) /* Run test suite and unset setup and teardown functions */ -#define MU_RUN_SUITE(suite_name) MU__SAFE_BLOCK(\ - suite_name();\ - minunit_setup = NULL;\ - minunit_teardown = NULL;\ -) +#define MU_RUN_SUITE(suite_name) \ + MU__SAFE_BLOCK(suite_name(); minunit_setup = NULL; minunit_teardown = NULL;) /* Configure setup and teardown functions */ -#define MU_SUITE_CONFIGURE(setup_fun, teardown_fun) MU__SAFE_BLOCK(\ - minunit_setup = setup_fun;\ - minunit_teardown = teardown_fun;\ -) +#define MU_SUITE_CONFIGURE(setup_fun, teardown_fun) \ + MU__SAFE_BLOCK(minunit_setup = setup_fun; minunit_teardown = teardown_fun;) /* Test runner */ -#define MU_RUN_TEST(test) MU__SAFE_BLOCK(\ - if (minunit_real_timer==0 && minunit_proc_timer==0) {\ - minunit_real_timer = mu_timer_real();\ - minunit_proc_timer = mu_timer_cpu();\ - }\ - if (minunit_setup) (*minunit_setup)();\ - minunit_status = 0;\ - test();\ - minunit_run++;\ - if (minunit_status) {\ - minunit_fail++;\ - printf("F");\ - printf("\n%s\n", minunit_last_message);\ - }\ - fflush(stdout);\ - if (minunit_teardown) (*minunit_teardown)();\ -) +#define MU_RUN_TEST(test) \ + MU__SAFE_BLOCK( \ + if(minunit_real_timer == 0 && minunit_proc_timer == 0) { \ + minunit_real_timer = mu_timer_real(); \ + minunit_proc_timer = mu_timer_cpu(); \ + } if(minunit_setup) (*minunit_setup)(); \ + minunit_status = 0; \ + test(); \ + minunit_run++; \ + if(minunit_status) { \ + minunit_fail++; \ + printf("F"); \ + printf("\n%s\n", minunit_last_message); \ + } fflush(stdout); \ + if(minunit_teardown)(*minunit_teardown)();) /* Report */ -#define MU_REPORT() MU__SAFE_BLOCK(\ - double minunit_end_real_timer;\ - double minunit_end_proc_timer;\ - printf("\n\n%d tests, %d assertions, %d failures\n", minunit_run, minunit_assert, minunit_fail);\ - minunit_end_real_timer = mu_timer_real();\ - minunit_end_proc_timer = mu_timer_cpu();\ - printf("\nFinished in %.8f seconds (real) %.8f seconds (proc)\n\n",\ - minunit_end_real_timer - minunit_real_timer,\ - minunit_end_proc_timer - minunit_proc_timer);\ -) +#define MU_REPORT() \ + MU__SAFE_BLOCK(double minunit_end_real_timer; double minunit_end_proc_timer; printf( \ + "\n\n%d tests, %d assertions, %d failures\n", \ + minunit_run, \ + minunit_assert, \ + minunit_fail); \ + minunit_end_real_timer = mu_timer_real(); \ + minunit_end_proc_timer = mu_timer_cpu(); \ + printf( \ + "\nFinished in %.8f seconds (real) %.8f seconds (proc)\n\n", \ + minunit_end_real_timer - minunit_real_timer, \ + minunit_end_proc_timer - minunit_proc_timer);) #define MU_EXIT_CODE minunit_fail /* Assertions */ -#define mu_check(test) MU__SAFE_BLOCK(\ - minunit_assert++;\ - if (!(test)) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__, #test);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_check(test) \ + MU__SAFE_BLOCK( \ + minunit_assert++; if(!(test)) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %s", \ + __func__, \ + __FILE__, \ + __LINE__, \ + #test); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_fail(message) MU__SAFE_BLOCK(\ - minunit_assert++;\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__, message);\ - minunit_status = 1;\ - return;\ -) +#define mu_fail(message) \ + MU__SAFE_BLOCK(minunit_assert++; snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %s", \ + __func__, \ + __FILE__, \ + __LINE__, \ + message); \ + minunit_status = 1; \ + return;) -#define mu_assert(test, message) MU__SAFE_BLOCK(\ - minunit_assert++;\ - if (!(test)) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__, message);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert(test, message) \ + MU__SAFE_BLOCK( \ + minunit_assert++; if(!(test)) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %s", \ + __func__, \ + __FILE__, \ + __LINE__, \ + message); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_int_eq(expected, result) MU__SAFE_BLOCK(\ - int minunit_tmp_e;\ - int minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (expected);\ - minunit_tmp_r = (result);\ - if (minunit_tmp_e != minunit_tmp_r) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %d expected but was %d", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_int_eq(expected, result) \ + MU__SAFE_BLOCK( \ + int minunit_tmp_e; int minunit_tmp_r; minunit_assert++; minunit_tmp_e = (expected); \ + minunit_tmp_r = (result); \ + if(minunit_tmp_e != minunit_tmp_r) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %d expected but was %d", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_e, \ + minunit_tmp_r); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_int_not_eq(expected, result) MU__SAFE_BLOCK(\ - int minunit_tmp_e;\ - int minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (expected);\ - minunit_tmp_r = (result);\ - if (minunit_tmp_e == minunit_tmp_r) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: expected different results but both were %d", __func__, __FILE__, __LINE__, minunit_tmp_e);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_int_not_eq(expected, result) \ + MU__SAFE_BLOCK( \ + int minunit_tmp_e; int minunit_tmp_r; minunit_assert++; minunit_tmp_e = (expected); \ + minunit_tmp_r = (result); \ + if(minunit_tmp_e == minunit_tmp_r) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: expected different results but both were %d", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_e); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_int_greater_than(val, result) MU__SAFE_BLOCK(\ - int minunit_tmp_e;\ - int minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (val);\ - minunit_tmp_r = (result);\ - if (val >= minunit_tmp_r) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %d <= %d", __func__, __FILE__, __LINE__, minunit_tmp_r, minunit_tmp_e);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_int_greater_than(val, result) \ + MU__SAFE_BLOCK( \ + int minunit_tmp_e; int minunit_tmp_r; minunit_assert++; minunit_tmp_e = (val); \ + minunit_tmp_r = (result); \ + if(val >= minunit_tmp_r) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %d <= %d", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_r, \ + minunit_tmp_e); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_int_less_than(val, result) MU__SAFE_BLOCK(\ - int minunit_tmp_e;\ - int minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (val);\ - minunit_tmp_r = (result);\ - if (val <= minunit_tmp_r) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %d >= %d", __func__, __FILE__, __LINE__, minunit_tmp_r, minunit_tmp_e);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_int_less_than(val, result) \ + MU__SAFE_BLOCK( \ + int minunit_tmp_e; int minunit_tmp_r; minunit_assert++; minunit_tmp_e = (val); \ + minunit_tmp_r = (result); \ + if(val <= minunit_tmp_r) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %d >= %d", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_r, \ + minunit_tmp_e); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_int_between(expected_lower, expected_upper, result) MU__SAFE_BLOCK(\ - int minunit_tmp_e;\ - int minunit_tmp_m;\ - int minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (expected_lower);\ - minunit_tmp_m = (expected_upper);\ - minunit_tmp_r = (result);\ - if (result < minunit_tmp_e || result > minunit_tmp_m) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %d was not between (inclusive) %d and %d", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r, minunit_tmp_m);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_int_between(expected_lower, expected_upper, result) \ + MU__SAFE_BLOCK( \ + int minunit_tmp_e; int minunit_tmp_m; int minunit_tmp_r; minunit_assert++; \ + minunit_tmp_e = (expected_lower); \ + minunit_tmp_m = (expected_upper); \ + minunit_tmp_r = (result); \ + if(result < minunit_tmp_e || result > minunit_tmp_m) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %d was not between (inclusive) %d and %d", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_e, \ + minunit_tmp_r, \ + minunit_tmp_m); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_int_in(expected, array_length, result) MU__SAFE_BLOCK(\ - int minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_r = (result);\ - int t = 0;\ - int i;\ - for (i = 0; i < array_length; i++) {\ - if (expected[i] == minunit_tmp_r)\ - t = 1;\ - }\ - if (t == 0) {\ - char tmp[500] = {0};\ - tmp[0] = '[';\ - for (i = 0; i < array_length; i++) {\ - sprintf(tmp + strlen(tmp), "%d, ", expected[i]);\ - }\ - int len = strlen(tmp);\ - tmp[len - 2] = ']';\ - tmp[len - 1] = '\0';\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: expected to be one of %s but was %d", __func__, __FILE__, __LINE__, tmp, minunit_tmp_r);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_int_in(expected, array_length, result) \ + MU__SAFE_BLOCK( \ + int minunit_tmp_r; minunit_assert++; minunit_tmp_r = (result); int t = 0; int i; \ + for(i = 0; i < array_length; i++) { \ + if(expected[i] == minunit_tmp_r) t = 1; \ + } if(t == 0) { \ + char tmp[500] = {0}; \ + tmp[0] = '['; \ + for(i = 0; i < array_length; i++) { \ + sprintf(tmp + strlen(tmp), "%d, ", expected[i]); \ + } \ + int len = strlen(tmp); \ + tmp[len - 2] = ']'; \ + tmp[len - 1] = '\0'; \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: expected to be one of %s but was %d", \ + __func__, \ + __FILE__, \ + __LINE__, \ + tmp, \ + minunit_tmp_r); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_double_eq(expected, result) MU__SAFE_BLOCK(\ - double minunit_tmp_e;\ - double minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (expected);\ - minunit_tmp_r = (result);\ - if (fabs(minunit_tmp_e-minunit_tmp_r) > MINUNIT_EPSILON) {\ - int minunit_significant_figures = 1 - log10(MINUNIT_EPSILON);\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %.*g expected but was %.*g", __func__, __FILE__, __LINE__, minunit_significant_figures, minunit_tmp_e, minunit_significant_figures, minunit_tmp_r);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_double_eq(expected, result) \ + MU__SAFE_BLOCK( \ + double minunit_tmp_e; double minunit_tmp_r; minunit_assert++; minunit_tmp_e = (expected); \ + minunit_tmp_r = (result); \ + if(fabs(minunit_tmp_e - minunit_tmp_r) > MINUNIT_EPSILON) { \ + int minunit_significant_figures = 1 - log10(MINUNIT_EPSILON); \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %.*g expected but was %.*g", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_significant_figures, \ + minunit_tmp_e, \ + minunit_significant_figures, \ + minunit_tmp_r); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_double_greater_than(val, result) MU__SAFE_BLOCK(\ - double minunit_tmp_e;\ - double minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (val);\ - minunit_tmp_r = (result);\ - if (val >= minunit_tmp_r) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %f <= %f", __func__, __FILE__, __LINE__, minunit_tmp_r, minunit_tmp_e);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_double_greater_than(val, result) \ + MU__SAFE_BLOCK( \ + double minunit_tmp_e; double minunit_tmp_r; minunit_assert++; minunit_tmp_e = (val); \ + minunit_tmp_r = (result); \ + if(val >= minunit_tmp_r) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %f <= %f", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_r, \ + minunit_tmp_e); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_double_less_than(val, result) MU__SAFE_BLOCK(\ - double minunit_tmp_e;\ - double minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (val);\ - minunit_tmp_r = (result);\ - if (val <= minunit_tmp_r) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %f >= %f", __func__, __FILE__, __LINE__, minunit_tmp_r, minunit_tmp_e);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_double_less_than(val, result) \ + MU__SAFE_BLOCK( \ + double minunit_tmp_e; double minunit_tmp_r; minunit_assert++; minunit_tmp_e = (val); \ + minunit_tmp_r = (result); \ + if(val <= minunit_tmp_r) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %f >= %f", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_r, \ + minunit_tmp_e); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_double_between(expected_lower, expected_upper, result) MU__SAFE_BLOCK(\ - double minunit_tmp_e;\ - double minunit_tmp_m;\ - double minunit_tmp_r;\ - minunit_assert++;\ - minunit_tmp_e = (expected_lower);\ - minunit_tmp_m = (expected_upper);\ - minunit_tmp_r = (result);\ - if (result < minunit_tmp_e || result > minunit_tmp_m) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %f was not between (inclusive) %f and %f", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r, minunit_tmp_m);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_double_between(expected_lower, expected_upper, result) \ + MU__SAFE_BLOCK( \ + double minunit_tmp_e; double minunit_tmp_m; double minunit_tmp_r; minunit_assert++; \ + minunit_tmp_e = (expected_lower); \ + minunit_tmp_m = (expected_upper); \ + minunit_tmp_r = (result); \ + if(result < minunit_tmp_e || result > minunit_tmp_m) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: %f was not between (inclusive) %f and %f", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_e, \ + minunit_tmp_r, \ + minunit_tmp_m); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_string_eq(expected, result) MU__SAFE_BLOCK(\ - const char* minunit_tmp_e = expected;\ - const char* minunit_tmp_r = result;\ - minunit_assert++;\ - if (!minunit_tmp_e) {\ - minunit_tmp_e = "";\ - }\ - if (!minunit_tmp_r) {\ - minunit_tmp_r = "";\ - }\ - if(strcmp(minunit_tmp_e, minunit_tmp_r)) {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: '%s' expected but was '%s'", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);\ - minunit_status = 1;\ - return;\ - } else {\ - printf(".");\ - }\ -) +#define mu_assert_string_eq(expected, result) \ + MU__SAFE_BLOCK( \ + const char* minunit_tmp_e = expected; const char* minunit_tmp_r = result; \ + minunit_assert++; \ + if(!minunit_tmp_e) { minunit_tmp_e = ""; } if(!minunit_tmp_r) { \ + minunit_tmp_r = ""; \ + } if(strcmp(minunit_tmp_e, minunit_tmp_r)) { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: '%s' expected but was '%s'", \ + __func__, \ + __FILE__, \ + __LINE__, \ + minunit_tmp_e, \ + minunit_tmp_r); \ + minunit_status = 1; \ + return; \ + } else { printf("."); }) -#define mu_assert_null(result) MU__SAFE_BLOCK(\ - minunit_assert++;\ - if (result == NULL) {\ - printf(".");\ - } else {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: Expected result was not NULL", __func__, __FILE__, __LINE__);\ - minunit_status = 1;\ - return;\ - }\ -) +#define mu_assert_null(result) \ + MU__SAFE_BLOCK( \ + minunit_assert++; if(result == NULL) { printf("."); } else { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: Expected result was not NULL", \ + __func__, \ + __FILE__, \ + __LINE__); \ + minunit_status = 1; \ + return; \ + }) -#define mu_assert_not_null(result) MU__SAFE_BLOCK(\ - minunit_assert++;\ - if (result != NULL) {\ - printf(".");\ - } else {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: Expected result was not NULL", __func__, __FILE__, __LINE__);\ - minunit_status = 1;\ - return;\ - }\ -) +#define mu_assert_not_null(result) \ + MU__SAFE_BLOCK( \ + minunit_assert++; if(result != NULL) { printf("."); } else { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: Expected result was not NULL", \ + __func__, \ + __FILE__, \ + __LINE__); \ + minunit_status = 1; \ + return; \ + }) -#define mu_assert_pointers_eq(pointer1, pointer2) MU__SAFE_BLOCK(\ - minunit_assert++;\ - if (pointer1 == pointer2) {\ - printf(".");\ - } else {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: Expected the pointers to point to the same memory location", __func__, __FILE__, __LINE__);\ - minunit_status = 1;\ - return;\ - }\ -) +#define mu_assert_pointers_eq(pointer1, pointer2) \ + MU__SAFE_BLOCK( \ + minunit_assert++; if(pointer1 == pointer2) { printf("."); } else { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: Expected the pointers to point to the same memory location", \ + __func__, \ + __FILE__, \ + __LINE__); \ + minunit_status = 1; \ + return; \ + }) -#define mu_assert_pointers_not_eq(pointer1, pointer2) MU__SAFE_BLOCK(\ - minunit_assert++;\ - if (pointer1 != pointer2) {\ - printf(".");\ - } else {\ - snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: Expected the pointers to point to the same memory location", __func__, __FILE__, __LINE__);\ - minunit_status = 1;\ - return;\ - }\ -) +#define mu_assert_pointers_not_eq(pointer1, pointer2) \ + MU__SAFE_BLOCK( \ + minunit_assert++; if(pointer1 != pointer2) { printf("."); } else { \ + snprintf( \ + minunit_last_message, \ + MINUNIT_MESSAGE_LEN, \ + "%s failed:\n\t%s:%d: Expected the pointers to point to the same memory location", \ + __func__, \ + __FILE__, \ + __LINE__); \ + minunit_status = 1; \ + return; \ + }) /* * The following two functions were written by David Robert Nadeau @@ -404,74 +457,71 @@ static void (*minunit_teardown)(void) = NULL; * The returned real time is only useful for computing an elapsed time * between two calls to this function. */ -static double mu_timer_real(void) -{ +static double mu_timer_real(void) { #if defined(_WIN32) - /* Windows 2000 and later. ---------------------------------- */ - LARGE_INTEGER Time; - LARGE_INTEGER Frequency; + /* Windows 2000 and later. ---------------------------------- */ + LARGE_INTEGER Time; + LARGE_INTEGER Frequency; - QueryPerformanceFrequency(&Frequency); - QueryPerformanceCounter(&Time); + QueryPerformanceFrequency(&Frequency); + QueryPerformanceCounter(&Time); - Time.QuadPart *= 1000000; - Time.QuadPart /= Frequency.QuadPart; + Time.QuadPart *= 1000000; + Time.QuadPart /= Frequency.QuadPart; - return (double)Time.QuadPart / 1000000.0; + return (double)Time.QuadPart / 1000000.0; -#elif (defined(__hpux) || defined(hpux)) || ((defined(__sun__) || defined(__sun) || defined(sun)) && (defined(__SVR4) || defined(__svr4__))) - /* HP-UX, Solaris. ------------------------------------------ */ - return (double)gethrtime( ) / 1000000000.0; +#elif(defined(__hpux) || defined(hpux)) || \ + ((defined(__sun__) || defined(__sun) || defined(sun)) && \ + (defined(__SVR4) || defined(__svr4__))) + /* HP-UX, Solaris. ------------------------------------------ */ + return (double)gethrtime() / 1000000000.0; #elif defined(__MACH__) && defined(__APPLE__) - /* OSX. ----------------------------------------------------- */ - static double timeConvert = 0.0; - if ( timeConvert == 0.0 ) - { - mach_timebase_info_data_t timeBase; - (void)mach_timebase_info( &timeBase ); - timeConvert = (double)timeBase.numer / - (double)timeBase.denom / - 1000000000.0; - } - return (double)mach_absolute_time( ) * timeConvert; + /* OSX. ----------------------------------------------------- */ + static double timeConvert = 0.0; + if(timeConvert == 0.0) { + mach_timebase_info_data_t timeBase; + (void)mach_timebase_info(&timeBase); + timeConvert = (double)timeBase.numer / (double)timeBase.denom / 1000000000.0; + } + return (double)mach_absolute_time() * timeConvert; #elif defined(_POSIX_VERSION) - /* POSIX. --------------------------------------------------- */ - struct timeval tm; + /* POSIX. --------------------------------------------------- */ + struct timeval tm; #if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) - { - struct timespec ts; + { + struct timespec ts; #if defined(CLOCK_MONOTONIC_PRECISE) - /* BSD. --------------------------------------------- */ - const clockid_t id = CLOCK_MONOTONIC_PRECISE; + /* BSD. --------------------------------------------- */ + const clockid_t id = CLOCK_MONOTONIC_PRECISE; #elif defined(CLOCK_MONOTONIC_RAW) - /* Linux. ------------------------------------------- */ - const clockid_t id = CLOCK_MONOTONIC_RAW; + /* Linux. ------------------------------------------- */ + const clockid_t id = CLOCK_MONOTONIC_RAW; #elif defined(CLOCK_HIGHRES) - /* Solaris. ----------------------------------------- */ - const clockid_t id = CLOCK_HIGHRES; + /* Solaris. ----------------------------------------- */ + const clockid_t id = CLOCK_HIGHRES; #elif defined(CLOCK_MONOTONIC) - /* AIX, BSD, Linux, POSIX, Solaris. ----------------- */ - const clockid_t id = CLOCK_MONOTONIC; + /* AIX, BSD, Linux, POSIX, Solaris. ----------------- */ + const clockid_t id = CLOCK_MONOTONIC; #elif defined(CLOCK_REALTIME) - /* AIX, BSD, HP-UX, Linux, POSIX. ------------------- */ - const clockid_t id = CLOCK_REALTIME; + /* AIX, BSD, HP-UX, Linux, POSIX. ------------------- */ + const clockid_t id = CLOCK_REALTIME; #else - const clockid_t id = (clockid_t)-1; /* Unknown. */ + const clockid_t id = (clockid_t)-1; /* Unknown. */ #endif /* CLOCK_* */ - if ( id != (clockid_t)-1 && clock_gettime( id, &ts ) != -1 ) - return (double)ts.tv_sec + - (double)ts.tv_nsec / 1000000000.0; - /* Fall thru. */ - } + if(id != (clockid_t)-1 && clock_gettime(id, &ts) != -1) + return (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0; + /* Fall thru. */ + } #endif /* _POSIX_TIMERS */ - /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, POSIX, Solaris. ----- */ - gettimeofday( &tm, NULL ); - return (double)tm.tv_sec + (double)tm.tv_usec / 1000000.0; + /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, POSIX, Solaris. ----- */ + gettimeofday(&tm, NULL); + return (double)tm.tv_sec + (double)tm.tv_usec / 1000000.0; #else - return -1.0; /* Failed. */ + return -1.0; /* Failed. */ #endif } @@ -479,80 +529,74 @@ static double mu_timer_real(void) * Returns the amount of CPU time used by the current process, * in seconds, or -1.0 if an error occurred. */ -static double mu_timer_cpu(void) -{ +static double mu_timer_cpu(void) { #if defined(_WIN32) - /* Windows -------------------------------------------------- */ - FILETIME createTime; - FILETIME exitTime; - FILETIME kernelTime; - FILETIME userTime; + /* Windows -------------------------------------------------- */ + FILETIME createTime; + FILETIME exitTime; + FILETIME kernelTime; + FILETIME userTime; - /* This approach has a resolution of 1/64 second. Unfortunately, Windows' API does not offer better */ - if ( GetProcessTimes( GetCurrentProcess( ), - &createTime, &exitTime, &kernelTime, &userTime ) != 0 ) - { - ULARGE_INTEGER userSystemTime; - memcpy(&userSystemTime, &userTime, sizeof(ULARGE_INTEGER)); - return (double)userSystemTime.QuadPart / 10000000.0; - } + /* This approach has a resolution of 1/64 second. Unfortunately, Windows' API does not offer better */ + if(GetProcessTimes(GetCurrentProcess(), &createTime, &exitTime, &kernelTime, &userTime) != 0) { + ULARGE_INTEGER userSystemTime; + memcpy(&userSystemTime, &userTime, sizeof(ULARGE_INTEGER)); + return (double)userSystemTime.QuadPart / 10000000.0; + } -#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__)) - /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, and Solaris --------- */ +#elif defined(__unix__) || defined(__unix) || defined(unix) || \ + (defined(__APPLE__) && defined(__MACH__)) + /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, and Solaris --------- */ #if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) - /* Prefer high-res POSIX timers, when available. */ - { - clockid_t id; - struct timespec ts; + /* Prefer high-res POSIX timers, when available. */ + { + clockid_t id; + struct timespec ts; #if _POSIX_CPUTIME > 0 - /* Clock ids vary by OS. Query the id, if possible. */ - if ( clock_getcpuclockid( 0, &id ) == -1 ) + /* Clock ids vary by OS. Query the id, if possible. */ + if(clock_getcpuclockid(0, &id) == -1) #endif #if defined(CLOCK_PROCESS_CPUTIME_ID) - /* Use known clock id for AIX, Linux, or Solaris. */ - id = CLOCK_PROCESS_CPUTIME_ID; + /* Use known clock id for AIX, Linux, or Solaris. */ + id = CLOCK_PROCESS_CPUTIME_ID; #elif defined(CLOCK_VIRTUAL) - /* Use known clock id for BSD or HP-UX. */ - id = CLOCK_VIRTUAL; + /* Use known clock id for BSD or HP-UX. */ + id = CLOCK_VIRTUAL; #else - id = (clockid_t)-1; + id = (clockid_t)-1; #endif - if ( id != (clockid_t)-1 && clock_gettime( id, &ts ) != -1 ) - return (double)ts.tv_sec + - (double)ts.tv_nsec / 1000000000.0; - } + if(id != (clockid_t)-1 && clock_gettime(id, &ts) != -1) + return (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0; + } #endif #if defined(RUSAGE_SELF) - { - struct rusage rusage; - if ( getrusage( RUSAGE_SELF, &rusage ) != -1 ) - return (double)rusage.ru_utime.tv_sec + - (double)rusage.ru_utime.tv_usec / 1000000.0; - } + { + struct rusage rusage; + if(getrusage(RUSAGE_SELF, &rusage) != -1) + return (double)rusage.ru_utime.tv_sec + (double)rusage.ru_utime.tv_usec / 1000000.0; + } #endif #if defined(_SC_CLK_TCK) - { - const double ticks = (double)sysconf( _SC_CLK_TCK ); - struct tms tms; - if ( times( &tms ) != (clock_t)-1 ) - return (double)tms.tms_utime / ticks; - } + { + const double ticks = (double)sysconf(_SC_CLK_TCK); + struct tms tms; + if(times(&tms) != (clock_t)-1) return (double)tms.tms_utime / ticks; + } #endif #if defined(CLOCKS_PER_SEC) - { - clock_t cl = clock( ); - if ( cl != (clock_t)-1 ) - return (double)cl / (double)CLOCKS_PER_SEC; - } + { + clock_t cl = clock(); + if(cl != (clock_t)-1) return (double)cl / (double)CLOCKS_PER_SEC; + } #endif #endif - return -1; /* Failed. */ + return -1; /* Failed. */ } #ifdef __cplusplus diff --git a/core/app.cpp b/core/app.cpp index e9590ead..24c19669 100644 --- a/core/app.cpp +++ b/core/app.cpp @@ -1,11 +1,11 @@ #include extern "C" { - #include "flipper.h" - #include "furi.h" - #include "log.h" - #include "startup.h" - #include "tty_uart.h" +#include "flipper.h" +#include "furi.h" +#include "log.h" +#include "startup.h" +#include "tty_uart.h" } // for testing purpose diff --git a/core/furi_ac.c b/core/furi_ac.c index b0087498..f75254f3 100644 --- a/core/furi_ac.c +++ b/core/furi_ac.c @@ -28,7 +28,7 @@ uint16_t furiac_get_task_id_by_name(const char* app_name) { } void furiac_wait_libs(const FlipperAppLibrary* libs) { - for(uint8_t i = 0; i < libs->count; i++){ + for(uint8_t i = 0; i < libs->count; i++) { uint16_t app_id = furiac_get_task_id_by_name(libs->name[i]); if(app_id == INVALID_TASK_ID) { diff --git a/docker/syntax_check.sh b/docker/syntax_check.sh index 549f3051..3f54df83 100755 --- a/docker/syntax_check.sh +++ b/docker/syntax_check.sh @@ -11,10 +11,8 @@ cd $PROJECT_DIR echo "RUN C\C++ SYNTAX CHECK" C_FILES=$(find . \ - -not \( -path './target_*/Middlewares' -prune \) \ - -not \( -path './target_*/Drivers' -prune \) \ - -not \( -path './target_*/build' -prune \) \ - -not \( -path './target_*/Inc' -prune \) \ + -not \( -path './firmware/.obj' -prune \) \ + -not \( -path './firmware/targets' -prune \) \ -not \( -path ./lib -prune \) \ -name *.c -o -name *.h -o -name *.cpp)