projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/stdint_.h (uintmax_t): Fix typo: int64_t -> uint64_t.
[gnulib.git]
/
lib
/
memcpy.c
diff --git
a/lib/memcpy.c
b/lib/memcpy.c
index
b26d6a4
..
d1e49c6
100644
(file)
--- a/
lib/memcpy.c
+++ b/
lib/memcpy.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* 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
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
@@
-12,27
+12,25
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
-#i
f HAVE_CONFIG_H
-# include <config.h>
-#
endif
+#i
nclude <config.h>
+
+#
include <stddef.h>
/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
if the source overlaps with the destination.
Return DESTADDR. */
/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
if the source overlaps with the destination.
Return DESTADDR. */
-char *
-memcpy (destaddr, srcaddr, len)
- char *destaddr;
- const char *srcaddr;
- int len;
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
{
char *dest = destaddr;
{
char *dest = destaddr;
+ char const *src = srcaddr;
while (len-- > 0)
while (len-- > 0)
- *dest
addr++ = *srcaddr
++;
- return dest;
+ *dest
++ = *src
++;
+ return dest
addr
;
}
}