aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-13 22:01:00 +0000
committerRoland McGrath <roland@gnu.org>1996-05-13 22:01:00 +0000
commita5b7bf0e62e88494d82f7ca6474b6b8b669c1e98 (patch)
treedaaf2d03e20448bd425400c78ffcee8fa82d4f11 /string
parent95a108f0baaa38911b02e90d1f8179fd08a01ac2 (diff)
downloadglibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.tar
glibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.tar.gz
glibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.tar.bz2
glibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.zip
* configure.in (--with-fp): Note in help string that it's the default.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Use u_int32_t instead of unsigned int for map_collection_max and map_collection_act. * stdio-common/vfprintf.c [USE_IN_LIBIO] (flockfile, funlockfile): Macros removed; they are in <stdio.h>. * stdio-common/vfscanf.c: Likewise. `-include' to not complain before they exist.
Diffstat (limited to 'string')
-rw-r--r--string/envz.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/string/envz.c b/string/envz.c
index e1487043e3..03af3d49ad 100644
--- a/string/envz.c
+++ b/string/envz.c
@@ -89,17 +89,17 @@ envz_remove (char **envz, size_t *envz_len, const char *name)
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 (char **envz, unsigned *envz_len, const char *name, const char *value)
+envz_add (char **envz, size_t *envz_len, const char *name, const char *value)
{
envz_remove (envz, envz_len, name);
if (value)
/* Add the new value, if there is one. */
{
- unsigned name_len = strlen (name);
- unsigned value_len = strlen (value);
- unsigned old_envz_len = *envz_len;
- unsigned new_envz_len = old_envz_len + name_len + 1 + value_len + 1;
+ size_t name_len = strlen (name);
+ size_t value_len = strlen (value);
+ size_t old_envz_len = *envz_len;
+ size_t new_envz_len = old_envz_len + name_len + 1 + value_len + 1;
char *new_envz = realloc (*envz, new_envz_len);
if (new_envz)
@@ -126,7 +126,7 @@ envz_add (char **envz, unsigned *envz_len, const char *name, const char *value)
OVERRIDE is true, then values in ENVZ2 will supercede those with the same
name in ENV, otherwise not. */
error_t
-envz_merge (char **envz, unsigned *envz_len, const char *envz2,
+envz_merge (char **envz, size_t *envz_len, const char *envz2,
size_t envz2_len, int override)
{
error_t err = 0;
@@ -153,13 +153,13 @@ envz_merge (char **envz, unsigned *envz_len, const char *envz2,
/* Remove null entries. */
void
-envz_strip (char **envz, unsigned *envz_len)
+envz_strip (char **envz, size_t *envz_len)
{
char *entry = *envz;
- unsigned left = *envz_len;
+ size_t left = *envz_len;
while (left)
{
- unsigned entry_len = strlen (entry) + 1;
+ size_t entry_len = strlen (entry) + 1;
left -= entry_len;
if (! index (entry, SEP))
/* Null entry. */