diff options
| author | DJ Delorie <dj@delorie.com> | 2003-04-15 15:27:20 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2003-04-15 15:27:20 +0000 |
| commit | 46719944c52283853b82d4fc76b6658b3f8831ca (patch) | |
| tree | 349b63b048c43c2500d0419f3bed41fd63d8e152 | |
| parent | eb604c51db8e4bcbc5cf944b110705a291a61b4f (diff) | |
| download | binutils-redhat-46719944c52283853b82d4fc76b6658b3f8831ca.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 9 | ||||
| -rw-r--r-- | libiberty/getopt.c | 6 | ||||
| -rw-r--r-- | libiberty/regex.c | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 6e9f6937dd..bfffec3f46 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -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. diff --git a/libiberty/getopt.c b/libiberty/getopt.c index 2402a39e2f..a1e482763c 100644 --- a/libiberty/getopt.c +++ b/libiberty/getopt.c @@ -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); } } diff --git a/libiberty/regex.c b/libiberty/regex.c index f9d9a4e26d..e3439b2ff6 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -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; |