X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcpy.c;h=2ab5ed6ee78c77dee4f51d3f36f4b325c32d8148;hb=fb84631f1ec8e82d252cbad0b5b7f83a98e74ba9;hp=d36cef20c56731fabc5a73e6fdad19838d96e8d5;hpb=552dcada1af3c14c4d357bff0ffff55ce4183102;p=gnulib.git

diff --git a/lib/memcpy.c b/lib/memcpy.c
index d36cef20c..2ab5ed6ee 100644
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,20 +1,38 @@
-/* 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 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 2, 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
+
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-char *
-memcpy (destaddr, srcaddr, len)
-     char *destaddr;
-     const char *srcaddr;
-     int len;
+#include <stddef.h>
+
+/* 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;
+  char const *src = srcaddr;
 
   while (len-- > 0)
-    *destaddr++ = *srcaddr++;
-  return dest;
+    *dest++ = *src++;
+  return destaddr;
 }