nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 06:18:40 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "libc/lib_bzero:Add bzero prototype."

Browse source 
This reverts commit 908814a575.

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 <buxiasen@gmail.com>
This commit is contained in:
buxiasen 2024-10-23 01:14:23 +08:00 committed by Xiang Xiao
parent 105d47b9a6
commit cb720024b6
4 changed files with 5 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/strings.h
View file

@ -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)
}

2
libs/libc/string/CMakeLists.txt
View file

@ -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

2
libs/libc/string/Make.defs
View file

@ -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

42
libs/libc/string/lib_bzero.c
View file

@ -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 <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);
}