This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new f12c4fb887 Revert "libc/lib_bzero:Add bzero prototype."
f12c4fb887 is described below
commit f12c4fb887a200596d4cdbb1e5340631adf1f26e
Author: chenrun1 <chenr...@xiaomi.com>
AuthorDate: Tue Nov 21 20:51:46 2023 +0800
Revert "libc/lib_bzero:Add bzero prototype."
---
include/strings.h | 6 ++++--
libs/libc/string/Make.defs | 2 +-
libs/libc/string/lib_bzero.c | 40 ----------------------------------------
3 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/include/strings.h b/include/strings.h
index ce4ae612a5..6a91d7cb3b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -49,6 +49,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)
@@ -91,8 +95,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)
{
diff --git a/libs/libc/string/Make.defs b/libs/libc/string/Make.defs
index 54989a901c..cec3d1ff62 100644
--- a/libs/libc/string/Make.defs
+++ b/libs/libc/string/Make.defs
@@ -30,7 +30,7 @@ CSRCS += lib_strndup.c lib_strcasestr.c lib_strpbrk.c
lib_strrchr.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_memchr.c lib_memcmp.c lib_memmove.c lib_memset.c
CSRCS += lib_strchr.c lib_strcmp.c lib_strcpy.c lib_strlcat.c
diff --git a/libs/libc/string/lib_bzero.c b/libs/libc/string/lib_bzero.c
deleted file mode 100644
index a0dfeace4e..0000000000
--- a/libs/libc/string/lib_bzero.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
- * libs/libc/string/lib_bzero.c
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <sys/types.h>
-#include <strings.h>
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: bzero
- ****************************************************************************/
-
-void bzero(FAR void *s, size_t n)
-{
- memset(s, 0, n);
-}
