aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1998-09-05 04:03:21 +0000
committerRoland McGrath <roland@gnu.org>1998-09-05 04:03:21 +0000
commit531e4bca8ea2931051e9ba458e2f486ac56d712a (patch)
treed9bf2727e9041118fd6878e5ebd3ff050cf858b3
parent62ee0979f4f39c98e6d8eb91bba2b480db035bfd (diff)
downloadglibc-531e4bca8ea2931051e9ba458e2f486ac56d712a.tar
glibc-531e4bca8ea2931051e9ba458e2f486ac56d712a.tar.gz
glibc-531e4bca8ea2931051e9ba458e2f486ac56d712a.tar.bz2
glibc-531e4bca8ea2931051e9ba458e2f486ac56d712a.zip
* string/argz-extract.c (__argz_extract): Add de-consting cast for
setting results. * string/argz-next.c (__argz_next): Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--string/argz-extract.c2
-rw-r--r--string/argz-next.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5056d33fb2..1ead6569ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
1998-09-05 Roland McGrath <roland@baalperazim.frob.com>
+ * string/argz-extract.c (__argz_extract): Add de-consting cast for
+ setting results.
+
* string/argz.h (argz_next): Add de-consting cast for return.
+ * string/argz-next.c (__argz_next): Likewise.
* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
Don't add netinet/udp.h, netinet/ip_icmp.h here.
diff --git a/string/argz-extract.c b/string/argz-extract.c
index f03272c9ec..5541caa2ca 100644
--- a/string/argz-extract.c
+++ b/string/argz-extract.c
@@ -28,7 +28,7 @@ __argz_extract (const char *argz, size_t len, char **argv)
while (len > 0)
{
size_t part_len = strlen (argz);
- *argv++ = argz;
+ *argv++ = (char *) argz;
argz += part_len + 1;
len -= part_len + 1;
}
diff --git a/string/argz-next.c b/string/argz-next.c
index edb495653e..b3dab09be0 100644
--- a/string/argz-next.c
+++ b/string/argz-next.c
@@ -33,7 +33,7 @@ __argz_next (const char *argz, size_t argz_len, const char *entry)
}
else
if (argz_len > 0)
- return argz;
+ return (char *) argz;
else
return NULL;
}