Skip to content

Commit

Permalink
StdLib: Move the declarations for ffs() and bzero() from extern.h to …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
darylm503 committed Nov 3, 2011
1 parent f45df7a commit feb1422
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 4 deletions.
56 changes: 56 additions & 0 deletions StdLib/Include/strings.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/** @file
Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
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 <machine/ansi.h>
#include <sys/featuretest.h>

__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 <string.h>

#endif /* !defined(_STRINGS_H_) */
3 changes: 1 addition & 2 deletions StdLib/LibC/Uefi/select.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,10 @@

#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <strings.h>
#include <sys/poll.h>
#include <sys/param.h>
#include <sys/time.h>
#include <extern.h> /* For ffs() */
#ifndef KERNEL
#define KERNEL
#include <errno.h>
Expand Down
2 changes: 0 additions & 2 deletions StdLibPrivateInternalFiles/Include/extern.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit feb1422

Please sign in to comment.