OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from gcc

This commit is contained in:
DJ Delorie 2003-04-15 15:27:20 +00:00
parent 37adfc7e9f
commit 258a4893ff
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libiberty/ChangeLog
View File

@ -1,3 +1,12 @@
2003-04-15 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
PR target/10338
PR bootstrap/10198
PR bootstrap/10140
* getopt.c (exchange, _getopt_initialize): Use mempcpy not
__mempcpy.
* regex.c (regerror): Likewise.
2003-04-14 Roger Sayle <roger@eyesopen.com>
* strdup.c (strdup): Tweak implementation to use memcpy.

6
libiberty/getopt.c
View File

@ -333,8 +333,8 @@ exchange (argv)
nonoption_flags_len = nonoption_flags_max_len = 0;
else
{
memset (__mempcpy (new_str, __getopt_nonoption_flags,
nonoption_flags_max_len),
memset (mempcpy (new_str, __getopt_nonoption_flags,
nonoption_flags_max_len),
'\0', top + 1 - nonoption_flags_max_len);
nonoption_flags_max_len = top + 1;
__getopt_nonoption_flags = new_str;
@ -444,7 +444,7 @@ _getopt_initialize (argc, argv, optstring)
if (__getopt_nonoption_flags == NULL)
nonoption_flags_max_len = -1;
else
memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
'\0', nonoption_flags_max_len - len);
}
}

2
libiberty/regex.c
View File

@ -8200,7 +8200,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
if (msg_size > errbuf_size)
{
#if defined HAVE_MEMPCPY || defined _LIBC
*((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
*((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
#else
memcpy (errbuf, msg, errbuf_size - 1);
errbuf[errbuf_size - 1] = 0;