X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcpy.c;h=1da71dd01dd731f253a2fc0553115b4f76884b16;hb=c70a54e290ea07f2ac94169b15aa1919dcb28028;hp=aec71e36bee903617e042fe077e999efb60356b6;hpb=18d51bdeb5da7a87ec8ade4aa8d97528cce57db9;p=gnulib.git
diff --git a/lib/memcpy.c b/lib/memcpy.c
index aec71e36b..1da71dd01 100644
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,29 +1,35 @@
-/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
- if the source overlaps with the destination.
- Return DESTADDR. */
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
-#include
+/* Written by Jim Meyering . */
-/* FIXME: uncomment the following for releases. */
-#define NDEBUG 1
+#include
-#ifndef ABS
-# define ABS(x) ((x) < 0 ? (-(x)) : (x))
-#endif
+#include
-char *
-memcpy (destaddr, srcaddr, len)
- char *destaddr;
- const char *srcaddr;
- int len;
+/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
+ if the source overlaps with the destination.
+ Return DESTADDR. */
+
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
{
char *dest = destaddr;
-
- assert (len >= 0);
- /* Make sure they don't overlap. */
- assert (ABS (destaddr - srcaddr) >= len);
+ char const *src = srcaddr;
while (len-- > 0)
- *destaddr++ = *srcaddr++;
- return dest;
+ *dest++ = *src++;
+ return destaddr;
}