diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/argz.h | 78 | ||||
| -rw-r--r-- | string/envz.h | 26 |
2 files changed, 53 insertions, 51 deletions
diff --git a/string/argz.h b/string/argz.h index 924dd46019..d9314e6bef 100644 --- a/string/argz.h +++ b/string/argz.h @@ -1,7 +1,5 @@ /* Routines for dealing with '\0' separated arg vectors. - Copyright (C) 1995, 1996 Free Software Foundation, Inc. - Written by Miles Bader <miles@gnu.ai.mit.edu> This program is free software; you can redistribute it and/or @@ -19,8 +17,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __ARGZ_H__ -#define __ARGZ_H__ 1 +#define __ARGZ_H__ 1 #include <features.h> #include <errno.h> /* Define error_t. */ @@ -32,47 +30,51 @@ __BEGIN_DECLS /* Make a '\0' separated arg vector from a unix argv vector, returning it in ARGZ, and the total length in LEN. If a memory allocation error occurs, ENOMEM is returned, otherwise 0. The result can be destroyed using free. */ -error_t __argz_create __P ((char *const argv[], char **argz, size_t *len)); -error_t argz_create __P ((char *const argv[], char **argz, size_t *len)); +extern error_t __argz_create __P ((char *const __argv[], char **__argz, + size_t *__len)); +extern error_t argz_create __P ((char *const __argv[], char **__argz, + size_t *__len)); /* Make a '\0' separated arg vector from a SEP separated list in STRING, returning it in ARGZ, and the total length in LEN. If a memory allocation error occurs, ENOMEM is returned, otherwise 0. The result can be destroyed using free. */ -error_t __argz_create_sep __P ((__const char *string, int sep, - char **argz, size_t *len)); -error_t argz_create_sep __P ((__const char *string, int sep, - char **argz, size_t *len)); +extern error_t __argz_create_sep __P ((__const char *__string, int __sep, + char **__argz, size_t *__len)); +extern error_t argz_create_sep __P ((__const char *__string, int __sep, + char **__argz, size_t *__len)); /* Returns the number of strings in ARGZ. */ -size_t __argz_count __P ((__const char *argz, size_t len)); -size_t argz_count __P ((__const char *argz, size_t len)); +extern size_t __argz_count __P ((__const char *__argz, size_t __len)); +extern size_t argz_count __P ((__const char *__argz, size_t __len)); /* Puts pointers to each string in ARGZ into ARGV, which must be large enough to hold them all. */ -void __argz_extract __P ((char *argz, size_t len, char **argv)); -void argz_extract __P ((char *argz, size_t len, char **argv)); +extern void __argz_extract __P ((char *__argz, size_t __len, char **__argv)); +extern void argz_extract __P ((char *__argz, size_t __len, char **__argv)); /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's except the last into the character SEP. */ -void __argz_stringify __P ((char *argz, size_t len, int sep)); -void argz_stringify __P ((char *argz, size_t len, int sep)); +extern void __argz_stringify __P ((char *__argz, size_t __len, int __sep)); +extern void argz_stringify __P ((char *__argz, size_t __len, int __sep)); /* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN. */ -error_t __argz_append __P ((char **argz, size_t *argz_len, - __const char *buf, size_t buf_len)); -error_t argz_append __P ((char **argz, size_t *argz_len, - __const char *buf, size_t buf_len)); +extern error_t __argz_append __P ((char **__argz, size_t *__argz_len, + __const char *__buf, size_t _buf_len)); +extern error_t argz_append __P ((char **__argz, size_t *__argz_len, + __const char *__buf, size_t __buf_len)); /* Append STR to the argz vector in ARGZ & ARGZ_LEN. */ -error_t __argz_add __P ((char **argz, size_t *argz_len, - __const char *str)); -error_t argz_add __P ((char **argz, size_t *argz_len, - __const char *str)); +extern error_t __argz_add __P ((char **__argz, size_t *__argz_len, + __const char *__str)); +extern error_t argz_add __P ((char **__argz, size_t *__argz_len, + __const char *__str)); /* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there. */ -void __argz_delete __P ((char **argz, size_t *argz_len, char *entry)); -void argz_delete __P ((char **argz, size_t *argz_len, char *entry)); +extern void __argz_delete __P ((char **__argz, size_t *__argz_len, + char *__entry)); +extern void argz_delete __P ((char **__argz, size_t *__argz_len, + char *__entry)); /* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end. @@ -80,10 +82,10 @@ void argz_delete __P ((char **argz, size_t *argz_len, char *entry)); ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ. If BEFORE is not in ARGZ, EINVAL is returned, else if memory can't be allocated for the new ARGZ, ENOMEM is returned, else 0. */ -error_t __argz_insert __P ((char **argz, size_t *argz_len, - char *before, __const char *entry)); -error_t argz_insert __P ((char **argz, size_t *argz_len, - char *before, __const char *entry)); +extern error_t __argz_insert __P ((char **__argz, size_t *__argz_len, + char *__before, __const char *__entry)); +extern error_t argz_insert __P ((char **__argz, size_t *__argz_len, + char *__before, __const char *__entry)); /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there are no more. If entry is NULL, then the first entry is returned. This @@ -106,25 +108,25 @@ extern char *argz_next __P ((char *argz, size_t __argz_len, #if defined (__OPTIMIZE__) && __GNUC__ >= 2 extern inline char * -__argz_next (char *argz, size_t argz_len, const char *entry) +__argz_next (char *__argz, size_t __argz_len, const char *__entry) { - if (entry) + if (__entry) { - if (entry < argz + argz_len) - entry = strchr (entry, '\0') + 1; + if (__entry < __argz + __argz_len) + __entry = strchr (__entry, '\0') + 1; - return entry >= argz + argz_len ? NULL : (char *) entry; + return __entry >= __argz + __argz_len ? NULL : (char *) __entry; } else - if (argz_len > 0) - return argz; + if (__argz_len > 0) + return __argz; else return 0; } extern inline char * -argz_next (char *argz, size_t argz_len, const char *entry) +argz_next (char *__argz, size_t __argz_len, const char *__entry) { - return __argz_next (argz, argz_len, entry); + return __argz_next (__argz, __argz_len, __entry); } #endif /* optimizing GCC2 */ diff --git a/string/envz.h b/string/envz.h index fd8865711d..dfd5e8aeb6 100644 --- a/string/envz.h +++ b/string/envz.h @@ -1,7 +1,5 @@ /* Routines for dealing with '\0' separated environment vectors - Copyright (C) 1995, 1996 Free Software Foundation, Inc. - Written by Miles Bader <miles@gnu.ai.mit.edu> This program is free software; you can redistribute it and/or @@ -19,7 +17,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __ENVZ_H__ -#define __ENVZ_H__ + +#define __ENVZ_H__ 1 +#include <features.h> #include <errno.h> @@ -28,13 +28,13 @@ #include <argz.h> /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none. */ -char *envz_entry __P ((__const char *__envz, size_t __envz_len, - __const char *__name)); +extern char *envz_entry __P ((__const char *__envz, size_t __envz_len, + __const char *__name)); /* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0 if there is none. */ -char *envz_get __P ((__const char *__envz, size_t __envz_len, - __const char *__name)); +extern char *envz_get __P ((__const char *__envz, size_t __envz_len, + __const char *__name)); /* 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 @@ -42,17 +42,17 @@ char *envz_get __P ((__const char *__envz, size_t __envz_len, return NULL, although envz_entry will still return an entry; this is handy because when merging with another envz, the null entry can override an entry in the other one. Null entries can be removed with envz_strip (). */ -error_t envz_add __P ((char **__envz, size_t *__envz_len, - __const char *__name, __const char *__value)); +extern error_t envz_add __P ((char **__envz, size_t *__envz_len, + __const char *__name, __const char *__value)); /* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add(). If OVERRIDE is true, then values in ENVZ2 will supercede those with the same name in ENV, otherwise not. */ -error_t envz_merge __P ((char **__envz, size_t *__envz_len, - __const char *__envz2, size_t __envz2_len, - int __override)); +extern error_t envz_merge __P ((char **__envz, size_t *__envz_len, + __const char *__envz2, size_t __envz2_len, + int __override)); /* Remove null entries. */ -void envz_strip __P ((char **__envz, size_t *__envz_len)); +extern void envz_strip __P ((char **__envz, size_t *__envz_len)); #endif /* __ENVZ_H__ */ |