Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

C library: Add ffs(). Add strings.h. Move strcasecmp, strncasecmp, bzero, bcmp, and bcopy to where they belong in strings.h.h, not string.h. bzero, bcmp, and bcopy are legacy functions; the contemporary counterparts should be used instead.

Browse Source
This commit is contained in:
Gregory Nutt
2017-02-16 16:10:09 -06:00
parent 6d1f3da289
commit 4f5879f998
11 changed files with 194 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/cxx/cstring
+9 -2
View File
@@ -42,6 +42,7 @@
#include <nuttx/config.h>
#include <string.h>
#include <strings.h>
//***************************************************************************
// Namespace
@@ -51,6 +52,8 @@ namespace std
{
using ::size_t;
// Declared in string.h
using ::strdup;
using ::strndup;
using ::strerror;
@@ -60,8 +63,6 @@ namespace std
using ::strncat;
using ::strcmp;
using ::strncmp;
using ::strcasecmp;
using ::strncasecmp;
using ::strcoll;
using ::stpcpy;
using ::strcpy;
@@ -83,6 +84,12 @@ namespace std
using ::memcpy;
using ::memmove;
using ::memset;
// Declared in legacy strings.h
using ::ffs;
using ::strcasecmp;
using ::strncasecmp;
}
#endif // __INCLUDE_CXX_CSTRING
include/string.h
+1 -12
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* include/string.h
*
* Copyright (C) 2007-2012, 2014, 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2012, 2014, 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -47,15 +47,6 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Compatibility definitions */
#ifndef CONFIG_LIBC_ARCH_BZERO
# define bzero(s,n) (void)memset(s,0,n)
#endif
#define bcopy(b1,b2,len) (void)memmove(b2,b1,len)
#define rindex(s,c) strrchr(s,c)
/****************************************************************************
* Public Function Prototypes
@@ -79,8 +70,6 @@ FAR char *strcat(FAR char *, FAR const char *);
FAR char *strncat(FAR char *, FAR const char *, size_t);
int strcmp(FAR const char *, FAR const char *);
int strncmp(FAR const char *, FAR const char *, size_t);
int strcasecmp(FAR const char *, FAR const char *);
int strncasecmp(FAR const char *, FAR const char *, size_t);
int strcoll(FAR const char *, FAR const char *s2);
FAR char *strcpy(char *dest, FAR const char *src);
FAR char *stpcpy(char *dest, FAR const char *src);
include/strings.h
+83
View File
@@ -0,0 +1,83 @@
/****************************************************************************
* include/strings.h
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
* COPYRIGHT OWNER 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.
*
****************************************************************************/
#ifndef __INCLUDE_STRINGS_H
#define __INCLUDE_STRINGS_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <string.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Compatibility definitions */
#define bcmp(b1,b2,len) memcmp(b1,b2,(size_t)len)
#define bcopy(b1,b2,len) (void)memmove(b2,b1,len)
#ifndef CONFIG_LIBC_ARCH_BZERO
# define bzero(s,n) (void)memset(s,0,n)
#endif
#define index(s,c) strchr(s,c)
#define rindex(s,c) strrchr(s,c)
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
int ffs(int j);
int strcasecmp(FAR const char *, FAR const char *);
int strncasecmp(FAR const char *, FAR const char *, size_t);
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __INCLUDE_STRINGS_H */