OrgUCloud
/
ucloud-iot-rtthread-package
mirror of https://github.com/ucloud/ucloud-iot-rtthread-package.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24 from ucloud/bug_fix_some_gcc_not_support_scanf_int8 

bug fix some gcc not support scanf int8 and uint8
This commit is contained in:
ethanDu1 2020-04-08 18:05:39 +08:00 committed by GitHub
parent bb38b4ab54 905b351112
commit 0707cbb7c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
uiot/utils/json_token.c
View File

@ -135,10 +135,26 @@ int LITE_get_int16(int16_t *value, char *src) {
return (sscanf(src, "%" SCNi16, value) == 1) ? SUCCESS_RET : FAILURE_RET; return (sscanf(src, "%" SCNi16, value) == 1) ? SUCCESS_RET : FAILURE_RET;
} }
/* NOTICE: scanning 8-bit types requires use of the hh specifier
* which is only supported on newlib platforms that
* are built with C99 I/O format support enabled. If the flag in
* newlib.h hasn't been set during configuration to indicate this, the 8-bit
* scanning format macros are disabled here as they result in undefined
* behaviour which can include memory overwrite. Overriding the flag after the
* library has been built is not recommended as it will expose the underlying
* undefined behaviour.so we use int16 and uint16 transfer to int8 and uint8
*/
int LITE_get_int8(int8_t *value, char *src) { int LITE_get_int8(int8_t *value, char *src) {
return (sscanf(src, "%" SCNi8, value) == 1) ? SUCCESS_RET : FAILURE_RET; int16_t temp = 0;
if(1 != sscanf(src, "%" SCNi16, temp))
{
return FAILURE_RET;
}
value = (int8_t)temp;
return SUCCESS_RET;
} }
int LITE_get_uint32(uint32_t *value, char *src) { int LITE_get_uint32(uint32_t *value, char *src) {
return (sscanf(src, "%" SCNu32, value) == 1) ? SUCCESS_RET : FAILURE_RET; return (sscanf(src, "%" SCNu32, value) == 1) ? SUCCESS_RET : FAILURE_RET;
} }
@ -148,7 +164,13 @@ int LITE_get_uint16(uint16_t *value, char *src) {
} }
int LITE_get_uint8(uint8_t *value, char *src) { int LITE_get_uint8(uint8_t *value, char *src) {
return (sscanf(src, "%" SCNu8, value) == 1) ? SUCCESS_RET : FAILURE_RET; uint16_t temp = 0;
if(1 != sscanf(src, "%" SCNu16, temp))
{
return FAILURE_RET;
}
value = (uint8_t)temp;
return SUCCESS_RET;
} }
int LITE_get_float(float *value, char *src) { int LITE_get_float(float *value, char *src) {

8
uiot/utils/lite-utils.h
View File

@ -57,14 +57,6 @@ extern "C" {
} while(0) } while(0)
#endif #endif
#ifndef SCNi8
#define SCNi8 "hhi"
#endif
#ifndef SCNu8
#define SCNu8 "hhu"
#endif
char *LITE_strdup(const char *src); char *LITE_strdup(const char *src);
char *LITE_format_string(const char *fmt, ...); char *LITE_format_string(const char *fmt, ...);
char *LITE_format_nstring(const int len, const char *fmt, ...); char *LITE_format_nstring(const int len, const char *fmt, ...);