From feb1422b3a557a844f1c8c9436fe1d7e0d87c364 Mon Sep 17 00:00:00 2001 From: darylm503 Date: Thu, 3 Nov 2011 00:35:55 +0000 Subject: [PATCH] StdLib: Move the declarations for ffs() and bzero() from extern.h to strings.h. Signed-off-by: darylm503 Reviewed-by: jljusten git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12654 6f19259b-4bc3-4df7-8a09-765794883524 --- StdLib/Include/strings.h | 56 +++++++++++++++++++++ StdLib/LibC/Uefi/select.c | 3 +- StdLibPrivateInternalFiles/Include/extern.h | 2 - 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 StdLib/Include/strings.h diff --git a/StdLib/Include/strings.h b/StdLib/Include/strings.h new file mode 100644 index 0000000000..139bd4a1dc --- /dev/null +++ b/StdLib/Include/strings.h @@ -0,0 +1,56 @@ +/** @file + Copyright (c) 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made available under + the terms and conditions of the BSD License that accompanies this distribution. + The full text of the license may be found at + http://opensource.org/licenses/bsd-license. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + + Copyright (c) 1998 The NetBSD Foundation, Inc. + All rights reserved. + + This code is derived from software contributed to The NetBSD Foundation + by Klaus Klein. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + NetBSD: strings.h,v 1.13 2008/04/28 20:22:54 martin Exp + */ +#ifndef _STRINGS_H_ +#define _STRINGS_H_ + +#include +#include + +__BEGIN_DECLS +void bzero(void *, size_t); +int ffs(int); +__END_DECLS + +#define index(x,y) strchr((x), (y)) +#define rindex(x,y) strrchr((x), (y)) + +#include + +#endif /* !defined(_STRINGS_H_) */ diff --git a/StdLib/LibC/Uefi/select.c b/StdLib/LibC/Uefi/select.c index 9d0dcc6e4a..28951856d1 100644 --- a/StdLib/LibC/Uefi/select.c +++ b/StdLib/LibC/Uefi/select.c @@ -53,11 +53,10 @@ #include #include -#include +#include #include #include #include -#include /* For ffs() */ #ifndef KERNEL #define KERNEL #include diff --git a/StdLibPrivateInternalFiles/Include/extern.h b/StdLibPrivateInternalFiles/Include/extern.h index fc39d52908..e0303dca11 100644 --- a/StdLibPrivateInternalFiles/Include/extern.h +++ b/StdLibPrivateInternalFiles/Include/extern.h @@ -66,6 +66,4 @@ int __sysctl(const int *, unsigned int, void *, size_t *, const void *, size_t); void Efi2Tm( EFI_TIME *ET, struct tm *BT); time_t Efi2Time( EFI_TIME *EfiBDtime); -int ffs(int x); - __END_DECLS -- 2.39.2