summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
Diffstat (limited to 'string')
-rw-r--r--string/argz-create.c5
-rw-r--r--string/argz-next.c2
-rw-r--r--string/argz.h62
-rw-r--r--string/envz.c12
-rw-r--r--string/envz.h4
5 files changed, 43 insertions, 42 deletions
diff --git a/string/argz-create.c b/string/argz-create.c
index fab3222cb3..2eea91162e 100644
--- a/string/argz-create.c
+++ b/string/argz-create.c
@@ -26,11 +26,12 @@
    ARGZ, and the total length in LEN.  If a memory allocation error occurs,
    ENOMEM is returned, otherwise 0.  */
 error_t
-__argz_create (char **argv, char **argz, size_t *len)
+__argz_create (char *const argv[], char **argz, size_t *len)
 {
   int argc;
   size_t tlen = 0;
-  char *p, **ap;
+  char *const *ap;
+  char *p;
 
   for (argc = 0; argv[argc] != NULL; ++argc)
     tlen += strlen (argv[argc]);
diff --git a/string/argz-next.c b/string/argz-next.c
index 6149c7ee51..416b982306 100644
--- a/string/argz-next.c
+++ b/string/argz-next.c
@@ -28,7 +28,7 @@ __argz_next (char *argz, size_t argz_len, const char *entry)
       if (entry < argz + argz_len)
 	entry = strchr (entry, '\0') + 1;
 
-      return entry >= argz + argz_len ? NULL : entry;
+      return entry >= argz + argz_len ? NULL : (char *) entry;
     }
   else
     if (argz_len > 0)
diff --git a/string/argz.h b/string/argz.h
index 733d06cca8..c2a3139dbb 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -32,47 +32,47 @@ __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 **__argv, char **__argz, size_t *__len));
-error_t argz_create __P ((char **__argv, char **__argz, size_t *__len));
+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));
 
 /* 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));
+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));
 
 /* 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));
+size_t __argz_count __P ((__const char *argz, size_t len));
+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 ((__const char *__argz, size_t __len, char **__argv));
-void argz_extract __P ((__const char *__argz, size_t __len, char **__argv));
+void __argz_extract __P ((__const char *argz, size_t len, char **argv));
+void argz_extract __P ((__const 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));
+void __argz_stringify __P ((char *argz, size_t len, int sep));
+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));
+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));
 
 /* 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));
+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));
 
 /* 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));
+void __argz_delete __P ((char **argz, size_t *argz_len, char *entry));
+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 +80,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));
+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));
 
 /* 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
@@ -99,10 +99,10 @@ error_t argz_insert __P ((char **__argz, size_t *__argz_len,
     for (entry = argz; entry; entry = argz_next (argz, argz_len, entry))
       ...;
 */
-extern char *__argz_next __P ((char *__argz, size_t __argz_len,
-			       __const char *__entry));
-extern char *argz_next __P ((char *__argz, size_t __argz_len,
-			     __const char *__entry));
+extern char *__argz_next __P ((char *argz, size_t __argz_len,
+			       __const char *entry));
+extern char *argz_next __P ((char *argz, size_t __argz_len,
+			     __const char *entry));
 
 #if defined (__OPTIMIZE__) && __GNUC__ >= 2
 extern inline char *
@@ -113,7 +113,7 @@ __argz_next (char *argz, size_t argz_len, const char *entry)
       if (entry < argz + argz_len)
 	entry = strchr (entry, '\0') + 1;
 
-      return entry >= argz + argz_len ? NULL : entry;
+      return entry >= argz + argz_len ? NULL : (char *) entry;
     }
   else
     if (argz_len > 0)
diff --git a/string/envz.c b/string/envz.c
index e751eccb8f..447b9e03b1 100644
--- a/string/envz.c
+++ b/string/envz.c
@@ -29,13 +29,13 @@
 /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.
    If NAME contains the separator character, only the portion before it is
    used in the comparison.  */
-const char *
+char *
 envz_entry (const char *envz, size_t envz_len, const char *name)
 {
   while (envz_len)
     {
-      char *p = name;
-      char *entry = envz;	/* Start of this entry. */
+      const char *p = name;
+      const char *entry = envz;	/* Start of this entry. */
 
       /* See how far NAME and ENTRY match.  */
       while (envz_len && *p == *envz && *p && *p != SEP)
@@ -43,7 +43,7 @@ envz_entry (const char *envz, size_t envz_len, const char *name)
 
       if ((*envz == '\0' || *envz == SEP) && (*p == '\0' || *p == SEP))
 	/* Bingo! */
-	return entry;
+	return (char *) entry;
 
       /* No match, skip to the next entry.  */
       while (envz_len && *envz)
@@ -60,7 +60,7 @@ envz_entry (const char *envz, size_t envz_len, const char *name)
 const char *
 envz_get (const char *envz, size_t envz_len, const char *name)
 {
-  char *entry = envz_entry (envz, envz_len, name);
+  const char *entry = envz_entry (envz, envz_len, name);
   if (entry)
     {
       while (*entry && *entry != SEP)
@@ -75,7 +75,7 @@ envz_get (const char *envz, size_t envz_len, const char *name)
 
 /* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any.  */
 void
-envz_remove (char **envz, size_t *envz_len, char *name)
+envz_remove (char **envz, size_t *envz_len, const char *name)
 {
   char *entry = envz_entry (*envz, *envz_len, name);
   if (entry)
diff --git a/string/envz.h b/string/envz.h
index dad2d281f4..bb907d7589 100644
--- a/string/envz.h
+++ b/string/envz.h
@@ -28,8 +28,8 @@
 #include <argz.h>
 
 /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.  */
-const char *envz_entry __P ((__const char *__envz, size_t __envz_len,
-			     __const char *__name));
+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.  */
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 03:32:56 +0000