Revert "libc/lib_bzero:Add bzero prototype."

This reverts commit 908814a. In macos, memset will be automatic optmize to bzero, caused dead loop, as we not using bzero, macro re-define should ablt to cover the requirements. Signed-off-by: buxiasen <[email protected]>
apache · Oct 23, 2024 · cb72002 · cb72002
1 parent 105d47b
commit cb72002
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 55 deletions.
diff --git a/include/strings.h b/include/strings.h
@@ -52,6 +52,10 @@
 #define bcopy(b1,b2,len) memmove(b2,b1,len)
 #endif
 
+#ifndef bzero /* See mm/README.txt */
+#define bzero(s,n)       memset(s,0,n)
+#endif
+
 #define strcasecmp_l(s1, s2, l)     strcasecmp(s1, s2)
 #define strncasecmp_l(s1, s2, n, l) strncasecmp(s1, s2, n)
 
@@ -155,16 +159,6 @@ FAR char *rindex(FAR const char *s, int c);
 int strcasecmp(FAR const char *, FAR const char *);
 int strncasecmp(FAR const char *, FAR const char *, size_t);
 
-void bzero(FAR void *s, size_t n);
-
-#if CONFIG_FORTIFY_SOURCE > 0
-fortify_function(bzero) void bzero(FAR void *s, size_t n)
-{
-  fortify_assert(n <= fortify_size(s, 0));
-  return __real_bzero(s, n);
-}
-#endif
-
 #undef EXTERN
 #if defined(__cplusplus)
 }

diff --git a/libs/libc/string/CMakeLists.txt b/libs/libc/string/CMakeLists.txt
@@ -23,7 +23,6 @@
 # Add the string C files to the build
 
 set(SRCS
-    lib_bzero.c
     lib_ffs.c
     lib_ffsl.c
     lib_ffsll.c
@@ -52,7 +51,6 @@ set(SRCS
     lib_strsep.c
     lib_strerrorr.c
     lib_explicit_bzero.c
-    lib_bzero.c
     lib_strsignal.c
     lib_index.c
     lib_rindex.c

diff --git a/libs/libc/string/Make.defs b/libs/libc/string/Make.defs
@@ -32,7 +32,7 @@ CSRCS += lib_strndup.c lib_strcasestr.c lib_strpbrk.c
 CSRCS += lib_strspn.c lib_strstr.c lib_strtok.c lib_strtokr.c
 CSRCS += lib_strsep.c lib_strerrorr.c lib_explicit_bzero.c lib_strsignal.c
 CSRCS += lib_index.c lib_rindex.c lib_timingsafe_bcmp.c lib_strverscmp.c
-CSRCS += lib_mempcpy.c lib_rawmemchr.c lib_bzero.c
+CSRCS += lib_mempcpy.c lib_rawmemchr.c
 
 CSRCS += lib_memmove.c lib_memset.c
 CSRCS += lib_strlcat.c

diff --git a/libs/libc/string/lib_bzero.c b/libs/libc/string/lib_bzero.c