diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/include/string.h | 5 | ||||
| -rw-r--r-- | nuttx/lib/string/Make.defs | 18 | ||||
| -rw-r--r-- | nuttx/lib/string/lib_memchr.c | 80 | ||||
| -rw-r--r-- | nuttx/lib/string/lib_strchr.c | 25 |
5 files changed, 110 insertions, 19 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 189784597..7f0f32ca2 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3089,4 +3089,5 @@ where Mirtoo ADC logic will eventually need to go. * arch/mips/src/pic32mx/pic32mx-gpio.c: Now supports the PIC32MX1/2 ANSEL IOPORT register. + * lib/string/lib_memchr.c: Add support for memchr() diff --git a/nuttx/include/string.h b/nuttx/include/string.h index 1c6f5c964..5fe394483 100644 --- a/nuttx/include/string.h +++ b/nuttx/include/string.h @@ -82,8 +82,8 @@ EXTERN int strncasecmp(FAR const char *, FAR const char *, size_t); EXTERN FAR char *strcpy(char *dest, FAR const char *src); EXTERN FAR char *strncpy(char *, FAR const char *, size_t); EXTERN FAR char *strpbrk(FAR const char *, FAR const char *); -EXTERN FAR char *strchr(FAR const char *, int); -EXTERN FAR char *strrchr(FAR const char *, int); +EXTERN FAR char *strchr(FAR const char *s, int c); +EXTERN FAR char *strrchr(FAR const char *s, int c); EXTERN size_t strspn(FAR const char *, FAR const char *); EXTERN size_t strcspn(FAR const char *, FAR const char *); EXTERN FAR char *strstr(FAR const char *, FAR const char *); @@ -91,6 +91,7 @@ EXTERN FAR char *strcasestr(FAR const char *, FAR const char *); EXTERN FAR char *strtok(FAR char *, FAR const char *); EXTERN FAR char *strtok_r(FAR char *, FAR const char *, FAR char **); +EXTERN FAR void *memchr(FAR const void *s, int c, size_t n); EXTERN FAR void *memset(FAR void *s, int c, size_t n); EXTERN FAR void *memcpy(FAR void *dest, FAR const void *src, size_t n); EXTERN int memcmp(FAR const void *s1, FAR const void *s2, size_t n); diff --git a/nuttx/lib/string/Make.defs b/nuttx/lib/string/Make.defs index 246b05381..c0a477c53 100644 --- a/nuttx/lib/string/Make.defs +++ b/nuttx/lib/string/Make.defs @@ -1,8 +1,8 @@ ############################################################################ # lib/string/Make.defs # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 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 @@ -33,11 +33,11 @@ # ############################################################################ -STRING_SRCS = lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memcpy.c \ - lib_memcmp.c lib_memmove.c lib_skipspace.c lib_strcasecmp.c \ - lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c lib_strcspn.c \ - lib_strdup.c lib_strerror.c lib_strlen.c lib_strnlen.c \ +STRING_SRCS = lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memchr.c \ + lib_memcpy.c lib_memcmp.c lib_memmove.c lib_skipspace.c \ + lib_strcasecmp.c lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c \ + lib_strcspn.c lib_strdup.c lib_strerror.c lib_strlen.c lib_strnlen.c \ lib_strncasecmp.c lib_strncat.c lib_strncmp.c lib_strncpy.c \ - lib_strndup.c lib_strcasestr.c lib_strpbrk.c lib_strrchr.c lib_strspn.c \ - lib_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c lib_strtoll.c \ - lib_strtoul.c lib_strtoull.c lib_strtod.c + lib_strndup.c lib_strcasestr.c lib_strpbrk.c lib_strrchr.c\ + lib_strspn.c lib_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c \ + lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtod.c diff --git a/nuttx/lib/string/lib_memchr.c b/nuttx/lib/string/lib_memchr.c new file mode 100644 index 000000000..e0dec8270 --- /dev/null +++ b/nuttx/lib/string/lib_memchr.c @@ -0,0 +1,80 @@ +/**************************************************************************** + * lib/string/lib_memchr.c + * + * Copyright (C) 2012 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <string.h> + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: memchr + * + * Description: + * The memchr() function locates the first occurrence of 'c' (converted to + * an unsigned char) in the initial 'n' bytes (each interpreted as + * unsigned char) of the object pointed to by s. + * + * Returned Value: + * The memchr() function returns a pointer to the located byte, or a null + * pointer if the byte does not occur in the object. + * + ****************************************************************************/ + +FAR void *memchr(FAR const void *s, int c, size_t n) +{ + FAR const unsigned char *p = (FAR const unsigned char *)s; + + if (s) + { + while (n--) + { + if (*p == (unsigned char)c) + { + return (FAR void *)p; + } + + p++; + } + } + + return NULL; +} diff --git a/nuttx/lib/string/lib_strchr.c b/nuttx/lib/string/lib_strchr.c index 1086f128d..ad7273862 100644 --- a/nuttx/lib/string/lib_strchr.c +++ b/nuttx/lib/string/lib_strchr.c @@ -1,8 +1,8 @@ /**************************************************************************** * lib/string/lib_strchr.c * - * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009, 2011-2012 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 @@ -45,11 +45,21 @@ * Global Functions ****************************************************************************/ -/* The strchr() function returns a pointer to the first - * occurrence of the character c in the string s. - */ +/**************************************************************************** + * Name: strchr + * + * Description: + * The strchr() function locates the first occurrence of 'c' (converted to + * a char) in the string pointed to by 's'. The terminating null byte is + * considered to be part of the string. + * + * Returned Value: + * Upon completion, strchr() returns a pointer to the byte, or a null + * pointer if the byte was not found. + * + ****************************************************************************/ -char *strchr(const char *s, int c) +FAR char *strchr(FAR const char *s, int c) { if (s) { @@ -57,11 +67,10 @@ char *strchr(const char *s, int c) { if (*s == c) { - return (char*)s; + return (FAR char *)s; } } } return NULL; } - |