diff options
| author | Wayne Lin <[email protected]> | 2022-01-10 12:36:11 +0800 |
|---|---|---|
| committer | Wayne Lin <[email protected]> | 2022-01-10 12:36:11 +0800 |
| commit | 715eecd3eb6cfbbc95aba4fdf932db2e1a7698fb (patch) | |
| tree | 111003eb53eaa4a789729792a622d2abfd602031 /components/utilities | |
| parent | 6d2a7d00db2808f26b96efaebfa3aa18b6fd47b8 (diff) | |
| parent | 5206f6504018d1e1978e1c547f6a5b782d505be5 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into nuvoton
# Conflicts:
# bsp/nuvoton/nk-980iot/.config
# bsp/nuvoton/nk-n9h30/.config
# bsp/nuvoton/nk-rtu980/.config
# bsp/nuvoton/numaker-iot-m487/.config
# bsp/nuvoton/numaker-m2354/.config
# bsp/nuvoton/numaker-pfm-m487/.config
Diffstat (limited to 'components/utilities')
| -rw-r--r-- | components/utilities/utest/utest.c | 2 | ||||
| -rw-r--r-- | components/utilities/zmodem/rz.c | 4 | ||||
| -rw-r--r-- | components/utilities/zmodem/sz.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/utilities/utest/utest.c b/components/utilities/utest/utest.c index 8c8ffd674a..21dc93100b 100644 --- a/components/utilities/utest/utest.c +++ b/components/utilities/utest/utest.c @@ -174,7 +174,7 @@ static void utest_run(const char *utest_name) tc_run_num = 0; if (tc_fail_list) { - memset(tc_fail_list, 0, TC_FAIL_LIST_SIZE); + rt_memset(tc_fail_list, 0, TC_FAIL_LIST_SIZE); } LOG_I("[==========] [ utest ] loop %d/%d", index + 1, tc_loop); diff --git a/components/utilities/zmodem/rz.c b/components/utilities/zmodem/rz.c index 1845fd24c2..224d8f95a8 100644 --- a/components/utilities/zmodem/rz.c +++ b/components/utilities/zmodem/rz.c @@ -44,7 +44,7 @@ void zr_start(char *path) rt_kprintf("zf: out of memory\r\n"); return; } - memset(zf, 0, sizeof(struct zfile)); + rt_memset(zf, 0, sizeof(struct zfile)); zf->fname = path; zf->fd = -1; res = zrec_files(zf); @@ -272,7 +272,7 @@ static rt_err_t zget_file_info(char *name, struct zfile *zf) rt_free(full_path); return -RT_ERROR; } - memset(full_path,0,len); + rt_memset(full_path,0,len); for (i=0,ptr=zf->fname;i<len-strlen(name)-2;i++) full_path[i] = *ptr++; diff --git a/components/utilities/zmodem/sz.c b/components/utilities/zmodem/sz.c index 0b0b5515f0..e6096756b1 100644 --- a/components/utilities/zmodem/sz.c +++ b/components/utilities/zmodem/sz.c @@ -47,7 +47,7 @@ void zs_start(char *path) return; } rt_kprintf("\r\nsz: ready...\r\n"); /* here ready to send things */ - memset(zf, 0, sizeof(struct zfile)); + rt_memset(zf, 0, sizeof(struct zfile)); zf->fname = path; zf->fd = -1; res = zsend_files(zf); |