[sscanf] use rt_sscanf to replace sscanf

mysterywolf · mysterywolf · commit d5125756708a · 2024-11-25T22:49:45.000-05:00
diff --git a/bsp/allwinner/libraries/libos/src/os.c b/bsp/allwinner/libraries/libos/src/os.c
@@ -201,7 +201,7 @@ int32_t esCFG_GetGPIOSecKeyCount(char *GPIOSecName)
     {
         return hal_spi_gpio_cfg_count(GPIOSecName);
     }
-    else if (sscanf(GPIOSecName, "twi%d", &id) == 1)
+    else if (rt_sscanf(GPIOSecName, "twi%d", &id) == 1)
     {
         return 2;
     }
@@ -308,11 +308,11 @@ int32_t esCFG_GetGPIOSecData(char *GPIOSecName, void *pGPIOCfg, int32_t GPIONum)
             gpio_cfg++;
         }
     }
-    else if (sscanf(GPIOSecName, "spi%d", &id) == 1)
+    else if (rt_sscanf(GPIOSecName, "spi%d", &id) == 1)
     {
         return hal_spi_gpio_cfg_load(gpio_cfg, GPIONum, id);
     }
-    else if (sscanf(GPIOSecName, "twi%d", &id) == 1)
+    else if (rt_sscanf(GPIOSecName, "twi%d", &id) == 1)
     {
         extern int hal_i2c_gpio_cfg_load(user_gpio_set_t *gpio_cfg, int32_t GPIONum, int id);
         return hal_i2c_gpio_cfg_load(gpio_cfg, GPIONum, id);
diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/sound/codecs/ac108.c b/bsp/allwinner/libraries/sunxi-hal/hal/source/sound/codecs/ac108.c
@@ -1691,15 +1691,15 @@ int cmd_ac108_reg(int argc, char ** argv)
             goto ac108_reg_exit;
         case 'd':
             if (isdigit(*optarg)) {
-                sscanf(optarg, "0x%x", &twi_addr);
+                rt_sscanf(optarg, "0x%x", &twi_addr);
                 //twi_addr = atoi(optarg);
                 printf("\ntwi_addr slave address is 0x%02x.\n", twi_addr);
             } else
                 fprintf(stderr, "twi addr is not a digital value.\n");
             break;
         case 'r':
             if (isdigit(*optarg)) {
-                sscanf(optarg, "0x%hhx", &read_cmd[0]);
+                rt_sscanf(optarg, "0x%hhx", &read_cmd[0]);
                 //read_cmd[0] = atoi(optarg);
                 write_cmd[0] = read_cmd[0];
                 printf("\nreg is 0x%02x.\n", read_cmd[0]);
@@ -1708,7 +1708,7 @@ int cmd_ac108_reg(int argc, char ** argv)
             break;
         case 'n':
             if (isdigit(*optarg)) {
-                sscanf(optarg, "0x%x", &num);
+                rt_sscanf(optarg, "0x%x", &num);
                 //num = atoi(optarg);
                 printf("\nnum is %d.\n", num);
             } else
@@ -1717,7 +1717,7 @@ int cmd_ac108_reg(int argc, char ** argv)
         case 'w':
             if (isdigit(*optarg)) {
                 wr_flag = 1;
-                sscanf(optarg, "0x%hhx", &write_cmd[1]);
+                rt_sscanf(optarg, "0x%hhx", &write_cmd[1]);
                 //write_cmd[1] = atoi(optarg);
                 printf("\nwrite val is 0x%02x.\n", write_cmd[1]);
             } else
diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/sound/component/aw-alsa-utils/amixer.c b/bsp/allwinner/libraries/sunxi-hal/hal/source/sound/component/aw-alsa-utils/amixer.c
@@ -139,7 +139,7 @@ static int amixer(int argc, char *argv[])
                 int card_index = 0;
 
                 if (isdigit((unsigned char)(*optarg))) {
-                    sscanf(optarg, "%d", &card_index);
+                    rt_sscanf(optarg, "%d", &card_index);
                     card_name = snd_card_name(card_index);
                     if (card_name == NULL) {
                         fprintf(stderr, "Invalid card number.\n");
diff --git a/bsp/allwinner/libraries/sunxi-hal/include/hal/sdmmc/cmd/cmd_util.h b/bsp/allwinner/libraries/sunxi-hal/include/hal/sdmmc/cmd/cmd_util.h
@@ -100,7 +100,7 @@ int32_t cmd_raw_mode_write(uint8_t *buf, int32_t size);
 #define cmd_atoi(s)                 atoi(s)
 #define cmd_atol(s)                 atol(s)
 
-#define cmd_sscanf(s, f, a...)      sscanf(s, f, ##a)
+#define cmd_sscanf(s, f, a...)      rt_sscanf(s, f, ##a)
 #define cmd_sprintf(s, f, a...)     sprintf(s, f, ##a)
 #define cmd_snprintf(s, n, f, a...) snprintf(s, n, f, ##a)
 
diff --git a/bsp/allwinner/libraries/sunxi-hal/include/hal/sdmmc/hal/hal_def.h b/bsp/allwinner/libraries/sunxi-hal/include/hal/sdmmc/hal/hal_def.h
@@ -77,7 +77,7 @@ extern "C" {
 #define HAL_SIZE_T      (unsigned long)
 #define HAL_PT_TO_U(v)      (HAL_SIZE_T(v))
 
-/*use to prinf and sscanf function to avoid compiler error*/
+/*use to prinf and rt_sscanf function to avoid compiler error*/
 #define HAL_PR_SZ_L(v)      (HAL_SIZE_T(v))
 #define HAL_PR_SZ(v)        ((unsigned int)(v))
 #define HAL_PR_SZ_P(v)      ((unsigned int *)(v))
diff --git a/bsp/nuvoton/libraries/m460/rtt_port/drv_common.c b/bsp/nuvoton/libraries/m460/rtt_port/drv_common.c
@@ -167,12 +167,12 @@ void devmem(int argc, char *argv[])
 
     if (argc == 3)
     {
-        if (sscanf(argv[2], "0x%x", &value) != 1)
+        if (rt_sscanf(argv[2], "0x%x", &value) != 1)
             goto exit_devmem;
         mode = 1; /*Write*/
     }
 
-    if (sscanf(argv[1], "0x%x", &u32Addr) != 1)
+    if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)
         goto exit_devmem;
     else if (!u32Addr || u32Addr & (4 - 1))
         goto exit_devmem;
@@ -203,12 +203,12 @@ void devmem2(int argc, char *argv[])
 
     if (argc == 3)
     {
-        if (sscanf(argv[2], "%u", &value) != 1)
+        if (rt_sscanf(argv[2], "%u", &value) != 1)
             goto exit_devmem;
         word_count = value;
     }
 
-    if (sscanf(argv[1], "0x%x", &u32Addr) != 1)
+    if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)
         goto exit_devmem;
     else if (!u32Addr || u32Addr & (4 - 1))
         goto exit_devmem;
diff --git a/bsp/nuvoton/libraries/ma35/rtt_port/drv_disp.c b/bsp/nuvoton/libraries/ma35/rtt_port/drv_disp.c
@@ -399,7 +399,7 @@ static rt_err_t lcd_set_overlay_colkey(int argc, char **argv)
 
     for (index = 0; index < (len - 1); index ++)
     {
-        if (sscanf(argv[index + 1], "%x", &arg[index]) != 1)
+        if (rt_sscanf(argv[index + 1], "%x", &arg[index]) != 1)
             return -1;
     }
     rt_kprintf("colkeylow:0x%08x colkeyhigh:0x%08x\n", arg[0], arg[1]);
@@ -459,7 +459,7 @@ static rt_err_t lcd_set_alphablend_opmode(int argc, char **argv)
 
     for (index = 0; index < (len - 1); index ++)
     {
-        if (sscanf(argv[index + 1], "%x", &arg[index]) != 1)
+        if (rt_sscanf(argv[index + 1], "%x", &arg[index]) != 1)
             return -1;
     }
 
diff --git a/bsp/nuvoton/libraries/ma35/rtt_port/drv_sys.c b/bsp/nuvoton/libraries/ma35/rtt_port/drv_sys.c
@@ -307,12 +307,12 @@ void devmem(int argc, char *argv[])
 
     if (argc == 3)
     {
-        if (sscanf(argv[2], "0x%x", &value) != 1)
+        if (rt_sscanf(argv[2], "0x%x", &value) != 1)
             goto exit_devmem;
         mode = 1; //Write
     }
 
-    if (sscanf(argv[1], "0x%x", &u32Addr) != 1)
+    if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)
         goto exit_devmem;
     else if (u32Addr & (4 - 1))
         goto exit_devmem;
@@ -343,12 +343,12 @@ void devmem2(int argc, char *argv[])
 
     if (argc == 3)
     {
-        if (sscanf(argv[2], "%d", &value) != 1)
+        if (rt_sscanf(argv[2], "%d", &value) != 1)
             goto exit_devmem;
         word_count = value;
     }
 
-    if (sscanf(argv[1], "0x%x", &u32Addr) != 1)
+    if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)
         goto exit_devmem;
     else if (u32Addr & (4 - 1))
         goto exit_devmem;
diff --git a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_common.c b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_common.c
@@ -90,12 +90,12 @@ void devmem(int argc, char *argv[])
 
     if (argc == 3)
     {
-        if (sscanf(argv[2], "0x%x", &value) != 1)
+        if (rt_sscanf(argv[2], "0x%x", &value) != 1)
             goto exit_devmem;
         mode = 1; //Write
     }
 
-    if (sscanf(argv[1], "0x%x", &u32Addr) != 1)
+    if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)
         goto exit_devmem;
     else if (!u32Addr || u32Addr & (4 - 1))
         goto exit_devmem;
diff --git a/bsp/nuvoton/libraries/nu_packages/Demo/wormhole_demo.c b/bsp/nuvoton/libraries/nu_packages/Demo/wormhole_demo.c
@@ -298,12 +298,12 @@ void whc_devmem(int argc, char *argv[])
 
     if (argc == 3)
     {
-        if (sscanf(argv[2], "0x%x", &value) != 1)
+        if (rt_sscanf(argv[2], "0x%x", &value) != 1)
             goto exit_devmem;
         mode = 1; //Write
     }
 
-    if (sscanf(argv[1], "0x%x", &u32Addr) != 1)
+    if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)
         goto exit_devmem;
     else if (u32Addr & (4 - 1))
         goto exit_devmem;
diff --git a/bsp/simulator/SDL2/include/SDL_stdinc.h b/bsp/simulator/SDL2/include/SDL_stdinc.h
@@ -697,7 +697,7 @@ size_t strlcat(char* dst, const char* src, size_t size);
 #define SDL_wcsncmp wcsncmp
 #define SDL_strcasecmp strcasecmp
 #define SDL_strncasecmp strncasecmp
-#define SDL_sscanf sscanf
+#define SDL_sscanf rt_sscanf
 #define SDL_vsscanf vsscanf
 #define SDL_snprintf snprintf
 #define SDL_vsnprintf vsnprintf
diff --git a/components/drivers/phy/ofw.c b/components/drivers/phy/ofw.c
@@ -116,7 +116,7 @@ rt_err_t rt_ofw_get_phyid(struct rt_ofw_node *np,rt_uint32_t *id)
     if (ret)
         return ret;
 
-    ret = sscanf(phy_id,"ethernet-phy-id%4x.%4x",&upper, &lower);
+    ret = rt_sscanf(phy_id,"ethernet-phy-id%4x.%4x",&upper, &lower);
     if(ret != 2)
         return -RT_ERROR;
 
diff --git a/components/libc/posix-info.txt b/components/libc/posix-info.txt
@@ -201,7 +201,7 @@
 + setvbuf()
 + snprintf()
 + sprintf()
-+ sscanf()
++ rt_sscanf()
 + stderr
 + stdin
 + stdout
diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c
@@ -759,7 +759,7 @@ static void at_connect_notice_cb(struct at_socket *sock, at_socket_evt_t event,
     }
     new_sock = at_get_socket(new_socket);
     new_sock->state = AT_SOCKET_CONNECT;
-    sscanf(buff, "SOCKET:%d", &base_socket);
+    rt_sscanf(buff, "SOCKET:%d", &base_socket);
     LOG_D("ACCEPT BASE SOCKET: %d", base_socket);
     new_sock->user_data = (void *)base_socket;
 
@@ -985,7 +985,7 @@ int at_accept(int socket, struct sockaddr *name, socklen_t *namelen)
         at_do_event_changes(sock, AT_EVENT_RECV, RT_FALSE);
     }
 
-    sscanf(&receive_buff[0], "SOCKET:%d", &new_socket);
+    rt_sscanf(&receive_buff[0], "SOCKET:%d", &new_socket);
     new_sock = at_get_socket(new_socket);
     ip4_addr_set_any(&remote_addr);
     ipaddr_port_to_socketaddr(name, &remote_addr, &remote_port);
diff --git a/documentation/at/at.md b/documentation/at/at.md
@@ -260,7 +260,7 @@ int at_req_parse_args(const char *req_args, const char *req_expr, ...);
 
 Among the four functions of an AT command, only the setting function has an input parameter, and the input parameter is to remove the rest of the AT command. For example, for a given command input `"AT+TEST=1,2,3,4"`, set the input parameter of the function to the parameter string `"=1,2,3,4"`.
 
-The command parsing function is mainly used in the AT function setting function, which is used to parse the incoming string parameter and obtain corresponding multiple input parameters for performing the following operations. The standard `sscanf` parsing grammar used in parsing grammar here will also be described in detail later in the AT Client parameter parsing function.
+The command parsing function is mainly used in the AT function setting function, which is used to parse the incoming string parameter and obtain corresponding multiple input parameters for performing the following operations. The standard `rt_sscanf` parsing grammar used in parsing grammar here will also be described in detail later in the AT Client parameter parsing function.
 
 |   **Parameter**   | **Description**                                 |
 |---------|-----------------------------------------------|
@@ -537,7 +537,7 @@ The implementation principle of sending and receiving data is relatively simple.
 
 ### AT Client Data Parsing Method ###
 
-After the data is normally acquired, the response data needs to be parsed, which is one of the important functions of the AT Client. Parsing of data in the AT Client provides a parsed form of a custom parsing expression whose parsing syntax uses the standard `sscanf` parsing syntax. Developers can use the custom data parsing expression to respond to useful information in the data, provided that the developer needs to review the relevant manual in advance to understand the basic format of the AT Server device response data that the AT Client connects to. The following is a simple AT Client data parsing method through several functions and routines.
+After the data is normally acquired, the response data needs to be parsed, which is one of the important functions of the AT Client. Parsing of data in the AT Client provides a parsed form of a custom parsing expression whose parsing syntax uses the standard `rt_sscanf` parsing syntax. Developers can use the custom data parsing expression to respond to useful information in the data, provided that the developer needs to review the relevant manual in advance to understand the basic format of the AT Server device response data that the AT Client connects to. The following is a simple AT Client data parsing method through several functions and routines.
 
 #### Get Response Data for the Specified Line Number
 
@@ -609,7 +609,7 @@ int at_resp_parse_line_args_by_kw(at_response_t resp, const char *keyword, const
 
 This function is used to get a row of data containing a keyword in the AT Server response data and parse the parameters in the row data.
 
-The data parsing syntax uses the standard `sscanf` syntax, the content of the syntax is more, developers can search their parsing syntax, here two procedures are used to introduce the simple use method.
+The data parsing syntax uses the standard `rt_sscanf` syntax, the content of the syntax is more, developers can search their parsing syntax, here two procedures are used to introduce the simple use method.
 
 #### Serial Port Configuration Information Analysis Example
 
@@ -676,7 +676,7 @@ printf("IP=%s, MAC=%s\n", ip, mac);
 at_delete_resp(resp);
 ```
 
-The key to parsing data is to correctly define the expression. Because the response data of the different device manufacturers is not unique to the response data of the AT device, only the form of the custom parsing expression can be obtained to obtain the required information. The design of the `at_resp_parse_line_args` parsing parameter function is based on the `sscanf` data parsing method. Before using it, the developer needs to understand the basic parsing syntax and then design the appropriate parsing syntax in combination with the response data. If the developer does not need to parse the specific parameters, you can use the `at_resp_get_line` function to get the specific data of a row.
+The key to parsing data is to correctly define the expression. Because the response data of the different device manufacturers is not unique to the response data of the AT device, only the form of the custom parsing expression can be obtained to obtain the required information. The design of the `at_resp_parse_line_args` parsing parameter function is based on the `rt_sscanf` data parsing method. Before using it, the developer needs to understand the basic parsing syntax and then design the appropriate parsing syntax in combination with the response data. If the developer does not need to parse the specific parameters, you can use the `at_resp_get_line` function to get the specific data of a row.
 
 ### AT Client URC Data Processing ###
 
diff --git a/examples/test/avl.c b/examples/test/avl.c
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
 {
     if (argc == 2)
     {
-        sscanf(argv[1], "%d", &loop_count);
+        rt_sscanf(argv[1], "%d", &loop_count);
     }
     else
     {
diff --git a/examples/utest/testcases/posix/stdio_h/Kconfig b/examples/utest/testcases/posix/stdio_h/Kconfig
@@ -127,7 +127,7 @@ if RTT_POSIX_TESTCASE_STDIO_H
         default n
 
     config STDIO_H_SSCANF
-        bool "<stdio.h> -> sscanf"
+        bool "<stdio.h> -> rt_sscanf"
         default n
 
     config STDIO_H_VFPRINTF
diff --git a/examples/utest/testcases/posix/stdio_h/definitions/stdio_h.c b/examples/utest/testcases/posix/stdio_h/definitions/stdio_h.c
@@ -103,7 +103,7 @@ __attribute__((unused)) static int test_defined()
     test_setvbuf = setvbuf;
     test_snprintf = snprintf;
     test_sprintf = sprintf;
-    test_sscanf = sscanf;
+    test_sscanf = rt_sscanf;
     test_ungetc = ungetc;
 
     test_stderr = stderr;
diff --git a/examples/utest/testcases/posix/stdio_h/functions/sscanf_tc.c b/examples/utest/testcases/posix/stdio_h/functions/sscanf_tc.c
@@ -7,7 +7,7 @@ static int sscanf_entry(void)
     char weekday[20], month[20], dtm[100];
 
     strcpy( dtm, "Friday January 1 2021" );
-    sscanf( dtm, "%s %s %d  %d", weekday, month, &day, &year );
+    rt_sscanf( dtm, "%s %s %d  %d", weekday, month, &day, &year );
 
     if(strcmp(month,"January") || strcmp(weekday,"Friday")
         || (year != 2021) ||(day != 1))
@@ -26,5 +26,5 @@ static void testcase(void)
 {
     UTEST_UNIT_RUN(test_sscanf);
 }
-UTEST_TC_EXPORT(testcase, "posix.stdio_h.sscanf.c", RT_NULL, RT_NULL, 10);
+UTEST_TC_EXPORT(testcase, "posix.stdio_h.rt_sscanf.c", RT_NULL, RT_NULL, 10);
 

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ int32_t esCFG_GetGPIOSecKeyCount(char *GPIOSecName)`
`201`	`201`	`{`
`202`	`202`	`return hal_spi_gpio_cfg_count(GPIOSecName);`
`203`	`203`	`}`
`204`		`- else if (sscanf(GPIOSecName, "twi%d", &id) == 1)`
	`204`	`+ else if (rt_sscanf(GPIOSecName, "twi%d", &id) == 1)`
`205`	`205`	`{`
`206`	`206`	`return 2;`
`207`	`207`	`}`
`@@ -308,11 +308,11 @@ int32_t esCFG_GetGPIOSecData(char GPIOSecName, void pGPIOCfg, int32_t GPIONum)`
`308`	`308`	`gpio_cfg++;`
`309`	`309`	`}`
`310`	`310`	`}`
`311`		`- else if (sscanf(GPIOSecName, "spi%d", &id) == 1)`
	`311`	`+ else if (rt_sscanf(GPIOSecName, "spi%d", &id) == 1)`
`312`	`312`	`{`
`313`	`313`	`return hal_spi_gpio_cfg_load(gpio_cfg, GPIONum, id);`
`314`	`314`	`}`
`315`		`- else if (sscanf(GPIOSecName, "twi%d", &id) == 1)`
	`315`	`+ else if (rt_sscanf(GPIOSecName, "twi%d", &id) == 1)`
`316`	`316`	`{`
`317`	`317`	`extern int hal_i2c_gpio_cfg_load(user_gpio_set_t *gpio_cfg, int32_t GPIONum, int id);`
`318`	`318`	`return hal_i2c_gpio_cfg_load(gpio_cfg, GPIONum, id);`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ static rt_err_t lcd_set_overlay_colkey(int argc, char **argv)`
`399`	`399`
`400`	`400`	`for (index = 0; index < (len - 1); index ++)`
`401`	`401`	`{`
`402`		`- if (sscanf(argv[index + 1], "%x", &arg[index]) != 1)`
	`402`	`+ if (rt_sscanf(argv[index + 1], "%x", &arg[index]) != 1)`
`403`	`403`	`return -1;`
`404`	`404`	`}`
`405`	`405`	`rt_kprintf("colkeylow:0x%08x colkeyhigh:0x%08x\n", arg[0], arg[1]);`
`@@ -459,7 +459,7 @@ static rt_err_t lcd_set_alphablend_opmode(int argc, char **argv)`
`459`	`459`
`460`	`460`	`for (index = 0; index < (len - 1); index ++)`
`461`	`461`	`{`
`462`		`- if (sscanf(argv[index + 1], "%x", &arg[index]) != 1)`
	`462`	`+ if (rt_sscanf(argv[index + 1], "%x", &arg[index]) != 1)`
`463`	`463`	`return -1;`
`464`	`464`	`}`
`465`	`465`
Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ void devmem(int argc, char *argv[])`
`90`	`90`
`91`	`91`	`if (argc == 3)`
`92`	`92`	`{`
`93`		`- if (sscanf(argv[2], "0x%x", &value) != 1)`
	`93`	`+ if (rt_sscanf(argv[2], "0x%x", &value) != 1)`
`94`	`94`	`goto exit_devmem;`
`95`	`95`	`mode = 1; //Write`
`96`	`96`	`}`
`97`	`97`
`98`		`- if (sscanf(argv[1], "0x%x", &u32Addr) != 1)`
	`98`	`+ if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)`
`99`	`99`	`goto exit_devmem;`
`100`	`100`	`else if (!u32Addr \|\| u32Addr & (4 - 1))`
`101`	`101`	`goto exit_devmem;`
Original file line number	Diff line number	Diff line change
`@@ -298,12 +298,12 @@ void whc_devmem(int argc, char *argv[])`
`298`	`298`
`299`	`299`	`if (argc == 3)`
`300`	`300`	`{`
`301`		`- if (sscanf(argv[2], "0x%x", &value) != 1)`
	`301`	`+ if (rt_sscanf(argv[2], "0x%x", &value) != 1)`
`302`	`302`	`goto exit_devmem;`
`303`	`303`	`mode = 1; //Write`
`304`	`304`	`}`
`305`	`305`
`306`		`- if (sscanf(argv[1], "0x%x", &u32Addr) != 1)`
	`306`	`+ if (rt_sscanf(argv[1], "0x%x", &u32Addr) != 1)`
`307`	`307`	`goto exit_devmem;`
`308`	`308`	`else if (u32Addr & (4 - 1))`
`309`	`309`	`goto exit_devmem;`