diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/argz-replace.c | 10 | ||||
| -rw-r--r-- | string/envz.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/string/argz-replace.c b/string/argz-replace.c index 4540cba..aeec5f5 100644 --- a/string/argz-replace.c +++ b/string/argz-replace.c @@ -1,5 +1,5 @@ /* String replacement in an argz vector - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998 Free Software Foundation, Inc. Written by Miles Bader <miles@gnu.ai.mit.edu> The GNU C Library is free software; you can redistribute it and/or @@ -69,7 +69,7 @@ __argz_replace (char **argz, size_t *argz_len, const char *str, const char *with { char *from = match + str_len; size_t to_len = match - arg; - char *to = strndup (arg, to_len); + char *to = __strndup (arg, to_len); while (to && from) { @@ -98,11 +98,11 @@ __argz_replace (char **argz, size_t *argz_len, const char *str, const char *with of SRC. */ { if (arg > src) - err = argz_append (&dst, &dst_len, src, (arg - src)); + err = __argz_append (&dst, &dst_len, src, (arg - src)); delayed_copy = 0; } if (! err) - err = argz_add (&dst, &dst_len, to); + err = __argz_add (&dst, &dst_len, to); free (to); } else @@ -112,7 +112,7 @@ __argz_replace (char **argz, size_t *argz_len, const char *str, const char *with (*replace_count)++; } else if (! delayed_copy) - err = argz_add (&dst, &dst_len, arg); + err = __argz_add (&dst, &dst_len, arg); } if (! err) diff --git a/string/envz.c b/string/envz.c index 535f42e..6b2fedc 100644 --- a/string/envz.c +++ b/string/envz.c @@ -1,5 +1,5 @@ /* Routines for dealing with '\0' separated environment vectors - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu> @@ -119,7 +119,7 @@ envz_add (char **envz, size_t *envz_len, const char *name, const char *value) } else /* Add a null entry. */ - return argz_add (envz, envz_len, name); + return __argz_add (envz, envz_len, name); } /* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add(). If @@ -137,11 +137,11 @@ envz_merge (char **envz, size_t *envz_len, const char *envz2, size_t new_len = strlen (envz2) + 1; if (! old) - err = argz_append (envz, envz_len, envz2, new_len); + err = __argz_append (envz, envz_len, envz2, new_len); else if (override) { argz_delete (envz, envz_len, old); - err = argz_append (envz, envz_len, envz2, new_len); + err = __argz_append (envz, envz_len, envz2, new_len); } envz2 += new_len; |