summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-11 08:57:42 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-11 08:57:42 +0000
commit431f91ba3a5d5d17d95f2b3a1fe6b2ce44fa8b41 (patch)
tree957687d75d55c9f27255b3479bb8364288e23b13 /string
parent7ccc548bd7b51bb1ab93db10a256344aa33b703a (diff)
downloadglibc-431f91ba3a5d5d17d95f2b3a1fe6b2ce44fa8b41.tar.gz
glibc-431f91ba3a5d5d17d95f2b3a1fe6b2ce44fa8b41.tar.xz
glibc-431f91ba3a5d5d17d95f2b3a1fe6b2ce44fa8b41.zip
Update.
1998-10-11  Ulrich Drepper  <drepper@cygnus.com>

	* Rules [posix in sysdirs]: Set L_tmpnam to 20.
	Patch by Zack Weinberg <zack@rabi.columbia.edu>.

	* string/bits/string2.h [!_STRING_ARCH_unaligned]
	(__mempcpy_small): Add parameter for 1 byte copy and use it.
	Reported by Geoff Keating <geoffk@ozemail.com.au>.
Diffstat (limited to 'string')
-rw-r--r--string/bits/string2.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h
index c47a73841a..eba4dc20df 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -173,6 +173,7 @@ __mempcpy_small (void *__dest1,
 }
 #  else
 #   define __mempcpy_args(src) \
+     ((__const char *) (src))[0],					      \
      __extension__ ((__STRING2_COPY_ARR2)				      \
       { { ((__const char *) (src))[0], ((__const char *) (src))[1] } }),      \
      __extension__ ((__STRING2_COPY_ARR3)				      \
@@ -200,7 +201,7 @@ __mempcpy_small (void *__dest1,
 	  ((__const char *) (src))[4], ((__const char *) (src))[5],	      \
 	  ((__const char *) (src))[6], ((__const char *) (src))[7] } })
 __STRING_INLINE void *
-__mempcpy_small (void *__dest1,
+__mempcpy_small (void *__dest1, char __src1,
 		 __STRING2_COPY_ARR2 __src2, __STRING2_COPY_ARR3 __src3,
 		 __STRING2_COPY_ARR4 __src4, __STRING2_COPY_ARR5 __src5,
 		 __STRING2_COPY_ARR6 __src6, __STRING2_COPY_ARR7 __src7,
@@ -210,7 +211,7 @@ __mempcpy_small (void *__dest1,
   switch (__srclen)
     {
     case 1:
-      *__dest = '\0';
+      *__dest = __src1;
       break;
     case 2:
       __extension__ *((__STRING2_COPY_ARR2 *) __dest) = __src2;