From 34bf170dee3941adbbcd89019dfd7f2b49a3ee0b Mon Sep 17 00:00:00 2001 From: anschrammh Date: Tue, 3 Oct 2023 20:46:38 +0200 Subject: [PATCH] Minor changes : added the static keyword to some global variables to at least limit their scope to the file --- src/W800_SDK_v1.00.10/app/ble/gadget_bridge.c | 14 +++++++------- src/gadget_bridge_parser/gadget_bridge.c | 14 +++++++------- .../gadget_bridge_parser.depend | 17 +++++++++++++++++ .../gadget_bridge_parser.layout | 8 ++++---- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/W800_SDK_v1.00.10/app/ble/gadget_bridge.c b/src/W800_SDK_v1.00.10/app/ble/gadget_bridge.c index 6aff305..f4539e7 100644 --- a/src/W800_SDK_v1.00.10/app/ble/gadget_bridge.c +++ b/src/W800_SDK_v1.00.10/app/ble/gadget_bridge.c @@ -69,7 +69,7 @@ typedef enum gadget_bridge_parser_fsm } gadget_bridge_parser_fsm_e; /* Internal variable definition */ -struct +static struct { char buffer[GADGET_BRIDGE_PARSER_BUFFER_SIZE + 1]; // The +1 is for the string termination character. uint16_t buffer_content_size; // Without counting the string termination character. @@ -86,7 +86,7 @@ struct .event_data = { .event_type = GADGET_BRIDGE_EVENT_TYPE_NONE}, }; -time_t _unix_timestamp = 0; +static time_t _unix_timestamp = 0; /* Internal function definition */ static const char *_gadget_bridge_toast_type_2_str(gadget_bridge_toast_type_e toast_type); @@ -1334,7 +1334,7 @@ static const char *_gadget_bridge_http_request_method_2_str(gadget_bridge_http_r } } -static bool _parser_extract_time(char *start, char *end) +static bool _parser_extract_time(char *start, char *end) { *end = '\0'; char *is_valid = NULL; @@ -1347,7 +1347,7 @@ static bool _parser_extract_time(char *start, char *end) return *is_valid == '\0'; } -static bool _parser_extract_handle(char *start, char *end) +static bool _parser_extract_handle(char *start, char *end) { *end = '\0'; char *is_valid = NULL; @@ -1360,7 +1360,7 @@ static bool _parser_extract_handle(char *start, char *end) return *is_valid == '\0'; } -static bool _parser_extract_uint8_t(char *start, char *end, uint8_t *data) +static bool _parser_extract_uint8_t(char *start, char *end, uint8_t *data) { *end = '\0'; char *is_valid = NULL; @@ -1371,7 +1371,7 @@ static bool _parser_extract_uint8_t(char *start, char *end, uint8_t *data) return *is_valid == '\0'; } -static bool _parser_extract_float(char *start, char *end, float *data) +static bool _parser_extract_float(char *start, char *end, float *data) { *end = '\0'; char *is_valid = NULL; @@ -1382,7 +1382,7 @@ static bool _parser_extract_float(char *start, char *end, float *data) return *is_valid == '\0'; } -static bool _parser_extract_uint16_t(char *start, char *end, uint16_t *data) +static bool _parser_extract_uint16_t(char *start, char *end, uint16_t *data) { *end = '\0'; char *is_valid = NULL; diff --git a/src/gadget_bridge_parser/gadget_bridge.c b/src/gadget_bridge_parser/gadget_bridge.c index 9d0539a..c6de8b3 100644 --- a/src/gadget_bridge_parser/gadget_bridge.c +++ b/src/gadget_bridge_parser/gadget_bridge.c @@ -72,7 +72,7 @@ typedef enum gadget_bridge_parser_fsm } gadget_bridge_parser_fsm_e; /* Internal variable definition */ -struct +static struct { char buffer[GADGET_BRIDGE_PARSER_BUFFER_SIZE + 1]; // The +1 is for the string termination character. uint16_t buffer_content_size; // Without counting the string termination character. @@ -89,7 +89,7 @@ struct .event_data = { .event_type = GADGET_BRIDGE_EVENT_TYPE_NONE}, }; -time_t _unix_timestamp = 0; +static time_t _unix_timestamp = 0; /* Internal function definition */ static const char *_gadget_bridge_toast_type_2_str(gadget_bridge_toast_type_e toast_type); @@ -1326,7 +1326,7 @@ static const char *_gadget_bridge_http_request_method_2_str(gadget_bridge_http_r } } -static bool _parser_extract_time(char *start, char *end) +static bool _parser_extract_time(char *start, char *end) { *end = '\0'; char *is_valid = NULL; @@ -1339,7 +1339,7 @@ static bool _parser_extract_time(char *start, char *end) return *is_valid == '\0'; } -static bool _parser_extract_handle(char *start, char *end) +static bool _parser_extract_handle(char *start, char *end) { *end = '\0'; char *is_valid = NULL; @@ -1352,7 +1352,7 @@ static bool _parser_extract_handle(char *start, char *end) return *is_valid == '\0'; } -static bool _parser_extract_uint8_t(char *start, char *end, uint8_t *data) +static bool _parser_extract_uint8_t(char *start, char *end, uint8_t *data) { *end = '\0'; char *is_valid = NULL; @@ -1363,7 +1363,7 @@ static bool _parser_extract_uint8_t(char *start, char *end, uint8_t *data) return *is_valid == '\0'; } -static bool _parser_extract_float(char *start, char *end, float *data) +static bool _parser_extract_float(char *start, char *end, float *data) { *end = '\0'; char *is_valid = NULL; @@ -1374,7 +1374,7 @@ static bool _parser_extract_float(char *start, char *end, float *data) return *is_valid == '\0'; } -static bool _parser_extract_uint16_t(char *start, char *end, uint16_t *data) +static bool _parser_extract_uint16_t(char *start, char *end, uint16_t *data) { *end = '\0'; char *is_valid = NULL; diff --git a/src/gadget_bridge_parser/gadget_bridge_parser.depend b/src/gadget_bridge_parser/gadget_bridge_parser.depend index 0177a93..80445fd 100644 --- a/src/gadget_bridge_parser/gadget_bridge_parser.depend +++ b/src/gadget_bridge_parser/gadget_bridge_parser.depend @@ -50,3 +50,20 @@ +1696357704 source:d:\users\think\documents\w800_smart_watch\src\gadget_bridge_parser\gadget_bridge.c + "gadget_bridge.h" + + + + +1695293778 d:\users\think\documents\w800_smart_watch\src\gadget_bridge_parser\gadget_bridge.h + + + + +1695293778 source:d:\users\think\documents\w800_smart_watch\src\gadget_bridge_parser\main.c + + + + "gadget_bridge.h" + diff --git a/src/gadget_bridge_parser/gadget_bridge_parser.layout b/src/gadget_bridge_parser/gadget_bridge_parser.layout index d65b91f..03ccd3c 100644 --- a/src/gadget_bridge_parser/gadget_bridge_parser.layout +++ b/src/gadget_bridge_parser/gadget_bridge_parser.layout @@ -7,14 +7,14 @@ - + - + - + - +