From 34f6374b9eea33d64723a2a8607b0956ef8cdc2b Mon Sep 17 00:00:00 2001 From: lixianjing Date: Sat, 16 Dec 2023 09:01:44 +0800 Subject: [PATCH] fix build warnings --- docs/changes.md | 3 +++ src/service/service.c | 2 +- src/tkc/date_time.c | 28 ++++++++++++++++++++-------- src/tkc/fscript.c | 8 ++++---- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/docs/changes.md b/docs/changes.md index 0a896bec8e..40dba33a32 100644 --- a/docs/changes.md +++ b/docs/changes.md @@ -1,5 +1,8 @@ # 最新动态 +2023/12/16 + * 修复stm32编译警告。 + 2023/12/15 * 完善csv file object diff --git a/src/service/service.c b/src/service/service.c index 3ed30c1c52..912e2f2fc7 100644 --- a/src/service/service.c +++ b/src/service/service.c @@ -417,4 +417,4 @@ ret_t tk_service_set_retry_times(tk_service_t* service, uint32_t retry_times) { service->retry_times = retry_times; return RET_OK; -} \ No newline at end of file +} diff --git a/src/tkc/date_time.c b/src/tkc/date_time.c index 49439d06d4..9cea85d2ed 100644 --- a/src/tkc/date_time.c +++ b/src/tkc/date_time.c @@ -232,8 +232,11 @@ ret_t date_time_parse_time(date_time_t* dt, const char* str) { n = tk_sscanf(str, "%d:%d:%d", &hour, &minute, &second); if (n >= 2) { - return date_time_set_hour(dt, hour) || date_time_set_minute(dt, minute) || - date_time_set_second(dt, second); + date_time_set_hour(dt, hour); + date_time_set_minute(dt, minute); + date_time_set_second(dt, second); + + return RET_OK; } else { return RET_BAD_PARAMS; } @@ -252,8 +255,11 @@ ret_t date_time_parse_date(date_time_t* dt, const char* str) { n = tk_sscanf(str, "%d-%d-%d", &year, &month, &day); } if (n == 3) { - return date_time_set_year(dt, year) || date_time_set_month(dt, month) || - date_time_set_day(dt, day); + date_time_set_year(dt, year); + date_time_set_month(dt, month); + date_time_set_day(dt, day); + + return RET_OK; } else { return RET_BAD_PARAMS; } @@ -275,10 +281,16 @@ ret_t date_time_parse_date_time(date_time_t* dt, const char* str) { n = tk_sscanf(str, "%d-%d-%d %d:%d:%d", &year, &month, &day, &hour, &minute, &second); } if (n >= 5) { - return date_time_set_year(dt, year) || date_time_set_month(dt, month) || - date_time_set_day(dt, day) || date_time_set_hour(dt, hour) || - date_time_set_minute(dt, minute) || date_time_set_second(dt, second); + date_time_set_year(dt, year); + date_time_set_month(dt, month); + date_time_set_day(dt, day); + date_time_set_hour(dt, hour); + date_time_set_minute(dt, minute); + date_time_set_second(dt, second); + + return RET_OK; } else { return RET_BAD_PARAMS; } -} \ No newline at end of file +} + diff --git a/src/tkc/fscript.c b/src/tkc/fscript.c index dec3df8f2f..bb3eecf15a 100644 --- a/src/tkc/fscript.c +++ b/src/tkc/fscript.c @@ -2897,7 +2897,7 @@ static ret_t func_abs(fscript_t* fscript, fscript_args_t* args, value_t* result) break; } case VALUE_TYPE_UINT8: { - value_set_uint8(result, tk_abs(value_uint8(v))); + value_set_uint8(result, value_uint8(v)); break; } case VALUE_TYPE_INT16: { @@ -2905,7 +2905,7 @@ static ret_t func_abs(fscript_t* fscript, fscript_args_t* args, value_t* result) break; } case VALUE_TYPE_UINT16: { - value_set_uint16(result, tk_abs(value_uint16(v))); + value_set_uint16(result, value_uint16(v)); break; } case VALUE_TYPE_INT32: { @@ -2913,7 +2913,7 @@ static ret_t func_abs(fscript_t* fscript, fscript_args_t* args, value_t* result) break; } case VALUE_TYPE_UINT32: { - value_set_uint32(result, tk_abs(value_uint32(v))); + value_set_uint32(result, value_uint32(v)); break; } case VALUE_TYPE_INT64: { @@ -2921,7 +2921,7 @@ static ret_t func_abs(fscript_t* fscript, fscript_args_t* args, value_t* result) break; } case VALUE_TYPE_UINT64: { - value_set_uint64(result, tk_abs(value_uint64(v))); + value_set_uint64(result, value_uint64(v)); break; } default: {