From d378e4204d643dc5ee5d6439dc80aae5ffc0119b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 6 Nov 1997 00:43:09 +0000 Subject: automatically generated from GPLed version --- getopt.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'getopt.c') diff --git a/getopt.c b/getopt.c index 570cb9d..2d3f3b6 100644 --- a/getopt.c +++ b/getopt.c @@ -331,9 +331,9 @@ exchange (argv) nonoption_flags_len = nonoption_flags_max_len = 0; else { - memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len); - memset (&new_str[nonoption_flags_max_len], '\0', - top + 1 - 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; } @@ -442,11 +442,8 @@ _getopt_initialize (argc, argv, optstring) if (__getopt_nonoption_flags == NULL) nonoption_flags_max_len = -1; else - { - memcpy (__getopt_nonoption_flags, orig_str, len); - memset (&__getopt_nonoption_flags[len], '\0', - nonoption_flags_max_len - len); - } + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); } } nonoption_flags_len = nonoption_flags_max_len; -- cgit v1.2.3