diff --git a/include/strings.h b/include/strings.h index 276a8bff80..42383e5ff5 100644 --- 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 index ee96ab147d..2fe47cc738 100644 --- 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 index ad167779ee..0ac85f3b4b 100644 --- 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 deleted file mode 100644 index e73ad42465..0000000000 --- a/libs/libc/string/lib_bzero.c +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - * libs/libc/string/lib_bzero.c - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 -#include -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: bzero - ****************************************************************************/ - -void bzero(FAR void *s, size_t n) -{ - memset(s, 0, n); -}