X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargz.in.h;h=d76935095dab11d80f6213312c0d1d29257ea2b3;hb=effe7821374f8b7e22e9de3df9cc4e5f285712bd;hp=696473d7d246c46a2634a8bb49fb1381e7d0cb9f;hpb=60b515ecca87d870ebbb072bca366d7d1c83d5c6;p=gnulib.git

diff --git a/lib/argz.in.h b/lib/argz.in.h
index 696473d7d..d76935095 100644
--- a/lib/argz.in.h
+++ b/lib/argz.in.h
@@ -1,5 +1,6 @@
 /* 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-2011 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,12 +17,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _ARGZ_H
-#define _ARGZ_H	1
+#define _ARGZ_H 1
 
 
 #define __need_error_t
 #include <errno.h>
-#include <string.h>		/* Need size_t, and strchr is called below.  */
+#include <string.h>             /* Need size_t, and strchr is called below.  */
 
 #ifndef const
 # define const const
@@ -38,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
@@ -46,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.  */
 
@@ -58,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.  */
@@ -68,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.
@@ -100,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
@@ -130,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;
     }
@@ -149,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);
 }