Add memccpy{}

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4990 7fd9a85b-ad96-42d3-883c-3090e2eb8679

nuttx/ChangeLog

@@ -3089,5 +3089,6 @@
 	  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()
+	* lib/string/lib_memchr.c:  Add support for memchr() (contributed by Mike Smith)
+	* lib/string/lib_memccpy.c:  Add support for memcpy()
 

nuttx/arch/arm/src/stm32/stm32_adc.c

@@ -964,7 +964,9 @@ static void adc_reset(FAR struct adc_dev_s *dev)
   uint32_t regval;
   int offset;
   int i;
+#ifdef ADC_HAVE_TIMER
   int ret;
+#endif
 
   avdbg("intf: ADC%d\n", priv->intf);
   flags = irqsave();
@@ -987,7 +989,6 @@ static void adc_reset(FAR struct adc_dev_s *dev)
 
   adc_putreg(priv, STM32_ADC_LTR_OFFSET, 0x00000000);
 
-
   /* Initialize the same sample time for each ADC 55.5 cycles
    *
    * During sample cycles channel selection bits must remain unchanged.

nuttx/include/string.h

@@ -67,7 +67,6 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-EXTERN FAR char  *strchr(FAR const char *s, int c);
 EXTERN FAR char  *strdup(FAR const char *s);
 EXTERN FAR char  *strndup(FAR const char *s, size_t size);
 EXTERN FAR const char *strerror(int);
@@ -92,10 +91,11 @@ 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  *memccpy(FAR void *s1, FAR const void *s2, 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);
+EXTERN FAR void  *memcpy(FAR void *dest, FAR const void *src, size_t n);
 EXTERN FAR void  *memmove(FAR void *dest, FAR const void *src, size_t count);
+EXTERN FAR void  *memset(FAR void *s, int c, size_t n);
 
 #undef EXTERN
 #if defined(__cplusplus)

nuttx/lib/string/Make.defs

@@ -34,7 +34,7 @@
 ############################################################################
 
 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_memccpy.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 \

nuttx/lib/string/lib_memccpy.c

@@ -0,0 +1,99 @@
+/****************************************************************************
+ * lib/string/lib_memccpy.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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Compilation Switches
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <string.h>
+
+/****************************************************************************
+ * Global Functions
+ ****************************************************************************/
+
+
+/****************************************************************************
+ * Name: memccpy
+ *
+ * Description:
+ *   The memccpy() function copies bytes from memory area s2 into s1,
+ *   stopping after the first occurrence of byte c (converted to an unsigned
+ *   char) is copied, or after n bytes are copied, whichever comes first. If
+ *   copying takes place between objects that overlap, the behavior is
+ *   undefined.
+ *
+ * Returned Value:
+ *   The memccpy() function returns a pointer to the byte after the copy of c
+ *   in s1, or a null pointer if c was not found in the first n bytes of s2.
+ *
+ ****************************************************************************/
+
+FAR void *memccpy(FAR void *s1, FAR const void *s2, int c, size_t n)
+{
+  FAR unsigned char *pout = (FAR unsigned char*)s1;
+  FAR unsigned char *pin  = (FAR unsigned char*)s2;
+
+  /* Copy at most n bytes */
+
+  while (n-- > 0)
+    {
+      /* Copy one byte */
+
+      *pout = *pin++;
+
+      /* Did we just copy the terminating byte c? */
+
+      if (*pout == (unsigned char)c)
+        {
+          /* Yes return a pointer to the byte after the copy of c into s1 */
+
+          return (FAR void *)pout;
+        }
+
+      /* No increment to the next destination location */
+
+      pout++;
+    }
+
+  /* C was not found in the first n bytes of s2 */
+
+  return NULL;
+}

nuttx/lib/string/lib_memcpy.c

@@ -1,8 +1,8 @@
-/************************************************************
+/****************************************************************************
  * lib/string/lib_memcpy.c
  *
  *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   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
@@ -31,29 +31,33 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Compilation Switches
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************/
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <string.h>
 
-/************************************************************
+/****************************************************************************
  * Global Functions
- ************************************************************/
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: memcpy
+ ****************************************************************************/
 
 #ifndef CONFIG_ARCH_MEMCPY
-void *memcpy(void *dest, const void *src, size_t n)
+FAR void *memcpy(FAR void *dest, FAR const void *src, size_t n)
 {
-  unsigned char *pout = (unsigned char*)dest;
+  FAR unsigned char *pout = (FAR unsigned char*)dest;
-  unsigned char *pin  = (unsigned char*)src;
+  FAR unsigned char *pin  = (FAR unsigned char*)src;
   while (n-- > 0) *pout++ = *pin++;
   return dest;
 }