X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargz.in.h;h=8b6e90df552e0b62f4c066194e306f287301228c;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=e89f02981f6d64dbe51a78a204ce7ee4728d28be;hpb=eb61774da0aea434755a8684e2bb2f6854bd4e1c;p=gnulib.git
diff --git a/lib/argz.in.h b/lib/argz.in.h
index e89f02981..8b6e90df5 100644
--- a/lib/argz.in.h
+++ b/lib/argz.in.h
@@ -1,29 +1,28 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995,96,97,98,99,2000,2004,2007 Free Software Foundation, Inc.
+ Copyright (C) 1995-2000, 2004, 2007, 2009-2013 Free Software Foundation,
+ Inc.
This file is part of the GNU C Library.
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
- The GNU C Library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#ifndef _ARGZ_H
-#define _ARGZ_H 1
+#define _ARGZ_H 1
#define __need_error_t
#include
-#include /* Need size_t, and strchr is called below. */
+#include /* Need size_t, and strchr is called below. */
#ifndef const
# define const const
@@ -40,7 +39,7 @@ typedef int error_t;
ENOMEM is returned, otherwise 0. The result can be destroyed using free. */
extern error_t argz_create (char *const __argv[], char **restrict __argz,
- size_t *restrict __len);
+ size_t *restrict __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
@@ -48,8 +47,8 @@ extern error_t argz_create (char *const __argv[], char **restrict __argz,
The result can be destroyed using free. */
extern error_t argz_create_sep (const char *restrict string,
- int __sep, char **restrict __argz,
- size_t *restrict __len);
+ int __sep, char **restrict __argz,
+ size_t *restrict __len);
/* Returns the number of strings in ARGZ. */
@@ -60,7 +59,7 @@ extern size_t argz_count (const char *__argz, size_t __len)
to hold them all. */
extern void argz_extract (const char *restrict __argz, size_t __len,
- char **restrict __argv);
+ char **restrict __argv);
/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
except the last into the character SEP. */
@@ -70,29 +69,29 @@ extern void argz_stringify (char *__argz, size_t __len, int __sep);
/* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN. */
extern error_t argz_append (char **restrict __argz,
- size_t *restrict __argz_len,
- const char *restrict __buf, size_t __buf_len)
+ size_t *restrict __argz_len,
+ const char *restrict __buf, size_t __buf_len)
;
/* Append STR to the argz vector in ARGZ & ARGZ_LEN. */
extern error_t argz_add (char **restrict __argz,
- size_t *restrict __argz_len,
- const char *restrict str);
+ size_t *restrict __argz_len,
+ const char *restrict str);
/* Append SEP separated list in STRING to the argz vector in ARGZ &
ARGZ_LEN. */
extern error_t argz_add_sep (char **restrict __argz,
- size_t *restrict __argz_len,
- const char *restrict string, int __delim)
+ size_t *restrict __argz_len,
+ const char *restrict string, int __delim)
;
/* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there. */
extern void argz_delete (char **restrict __argz,
- size_t *restrict __argz_len,
- char *restrict __entry);
+ size_t *restrict __argz_len,
+ char *restrict __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.
@@ -102,19 +101,19 @@ extern void argz_delete (char **restrict __argz,
ARGZ, ENOMEM is returned, else 0. */
extern error_t argz_insert (char **restrict __argz,
- size_t *restrict __argz_len,
- char *restrict __before,
- const char *restrict __entry);
+ size_t *restrict __argz_len,
+ char *restrict __before,
+ const char *restrict __entry);
/* Replace any occurrences of the string STR in ARGZ with WITH, reallocating
ARGZ as necessary. If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
incremented by number of replacements performed. */
extern error_t argz_replace (char **restrict __argz,
- size_t *restrict __argz_len,
- const char *restrict str,
- const char *restrict __with,
- unsigned int *restrict __replace_count);
+ size_t *restrict __argz_len,
+ const char *restrict str,
+ const char *restrict __with,
+ unsigned int *restrict __replace_count);
/* 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
@@ -132,17 +131,17 @@ extern error_t argz_replace (char **restrict __argz,
*/
extern char *argz_next (const char *restrict __argz, size_t __argz_len,
- const char *restrict __entry);
+ const char *restrict __entry);
#ifdef __USE_EXTERN_INLINES
__extern_inline char *
__NTH (argz_next (const char *__argz, size_t __argz_len,
- const char *__entry))
+ const char *__entry))
{
if (__entry)
{
if (__entry < __argz + __argz_len)
- __entry = strchr (__entry, '\0') + 1;
+ __entry = strchr (__entry, '\0') + 1;
return __entry >= __argz + __argz_len ? (char *) NULL : (char *) __entry;
}
@@ -151,7 +150,7 @@ __NTH (argz_next (const char *__argz, size_t __argz_len,
}
__extern_inline char *
__NTH (argz_next (const char *__argz, size_t __argz_len,
- const char *__entry))
+ const char *__entry))
{
return argz_next (__argz, __argz_len, __entry);
}