diff options
| author | Roland McGrath <roland@gnu.org> | 2002-08-04 01:28:06 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-08-04 01:28:06 +0000 |
| commit | 37f3ee4954f3503307cbbaae7d8220079efc5e36 (patch) | |
| tree | b854709375783b9df107b624708bba9e735aa215 | |
| parent | 4547dee327b2a992fb5c7a39df41d19c1fc0bae6 (diff) | |
| download | glibc-37f3ee4954f3503307cbbaae7d8220079efc5e36.tar glibc-37f3ee4954f3503307cbbaae7d8220079efc5e36.tar.gz glibc-37f3ee4954f3503307cbbaae7d8220079efc5e36.tar.bz2 glibc-37f3ee4954f3503307cbbaae7d8220079efc5e36.zip | |
2002-08-03 Roland McGrath <roland@redhat.com>
* include/envz.h: Use libc_hidden_proto for envz_entry, enz_remove.
* include/argz.h: Use libc_hidden_proto for argz_delete.
* string/argz-delete.c: Add libc_hidden_def.
* string/envz.c: Likewise. Use <envz.h>, not "envz.h".
| -rw-r--r-- | include/argz.h | 2 | ||||
| -rw-r--r-- | include/envz.h | 7 | ||||
| -rw-r--r-- | string/argz-delete.c | 5 | ||||
| -rw-r--r-- | string/envz.c | 8 |
4 files changed, 17 insertions, 5 deletions
diff --git a/include/argz.h b/include/argz.h index 55c7f53a92..1b97ed308d 100644 --- a/include/argz.h +++ b/include/argz.h @@ -2,6 +2,8 @@ #include <string/argz.h> +libc_hidden_proto (argz_delete) + extern size_t __argz_count_internal (__const char *__argz, size_t __len) __attribute_pure__ attribute_hidden; extern void __argz_stringify_internal (char *__argz, size_t __len, int __sep) diff --git a/include/envz.h b/include/envz.h index 0a476ed62a..8cfd9b57e9 100644 --- a/include/envz.h +++ b/include/envz.h @@ -1 +1,8 @@ +#ifndef _ENVZ_H + #include <string/envz.h> + +libc_hidden_proto (envz_entry) +libc_hidden_proto (envz_remove) + +#endif diff --git a/string/argz-delete.c b/string/argz-delete.c index 3fe7d5d7d9..508b837a8a 100644 --- a/string/argz-delete.c +++ b/string/argz-delete.c @@ -1,7 +1,7 @@ /* Routines for dealing with '\0' separated arg vectors. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. - Written by Miles Bader <miles@gnu.ai.mit.edu> + Written by Miles Bader <miles@gnu.org> The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -39,3 +39,4 @@ argz_delete (char **argz, size_t *argz_len, char *entry) } } } +libc_hidden_def (argz_delete) diff --git a/string/envz.c b/string/envz.c index 3805b2c410..e1532ca948 100644 --- a/string/envz.c +++ b/string/envz.c @@ -1,7 +1,7 @@ /* Routines for dealing with '\0' separated environment vectors - Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,2001,02 Free Software Foundation, Inc. This file is part of the GNU C Library. - Written by Miles Bader <miles@gnu.ai.mit.edu> + Written by Miles Bader <miles@gnu.org> The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include <malloc.h> #include <string.h> -#include "envz.h" +#include <envz.h> /* The character separating names from values in an envz. */ #define SEP '=' @@ -54,6 +54,7 @@ envz_entry (const char *envz, size_t envz_len, const char *name) return 0; } +libc_hidden_def (envz_entry) /* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0 if there is none. */ @@ -81,6 +82,7 @@ envz_remove (char **envz, size_t *envz_len, const char *name) if (entry) argz_delete (envz, envz_len, entry); } +libc_hidden_def (envz_remove) /* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN. If an entry with the same name already exists in ENVZ, it is removed. If VALUE is |