summaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorMarek Polacek <mpolacek@redhat.com>2011-07-19 20:13:31 -0400
committerUlrich Drepper <drepper@gmail.com>2011-07-19 20:13:31 -0400
commitb902330ca8abb08c2114aa9636c77ac0553257f9 (patch)
tree68d026976d79d5089e8ecc07c9c9ee65e0bac919 /nscd
parent80029994814f0718aef9568c90f04b3d9a31802c (diff)
downloadglibc-b902330ca8abb08c2114aa9636c77ac0553257f9.tar.gz
Avoid warning in nscd config file parsing code
Diffstat (limited to 'nscd')
-rw-r--r--nscd/nscd_conf.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c
index 9d0ef0e43d..3b6cbb0b15 100644
--- a/nscd/nscd_conf.c
+++ b/nscd/nscd_conf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 2000, 2003-2007, 2008 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 2000, 2003-2008, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
@@ -189,17 +189,17 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
max_nthreads = MAX (atol (arg1), lastdb);
}
else if (strcmp (entry, "server-user") == 0)
- {
- if (!arg1)
- error (0, 0, _("Must specify user name for server-user option"));
- else
- server_user = xstrdup (arg1);
- }
+ {
+ if (!arg1)
+ error (0, 0, _("Must specify user name for server-user option"));
+ else
+ server_user = xstrdup (arg1);
+ }
else if (strcmp (entry, "stat-user") == 0)
- {
- if (arg1 == NULL)
- error (0, 0, _("Must specify user name for stat-user option"));
- else
+ {
+ if (arg1 == NULL)
+ error (0, 0, _("Must specify user name for stat-user option"));
+ else
{
stat_user = xstrdup (arg1);
@@ -207,7 +207,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
if (pw != NULL)
stat_uid = pw->pw_uid;
}
- }
+ }
else if (strcmp (entry, "persistent") == 0)
{
int idx = find_db (arg1);
@@ -236,13 +236,11 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
reload_count = UINT_MAX;
else
{
- unsigned int count = strtoul (arg1, NULL, 0);
+ unsigned long int count = strtoul (arg1, NULL, 0);
if (count > UINT8_MAX - 1)
reload_count = UINT_MAX;
- else if (count >= 0)
- reload_count = count;
else
- error (0, 0, _("invalid value for 'reload-count': %u"), count);
+ reload_count = count;
}
}
else if (strcmp (entry, "paranoia") == 0)
@@ -257,7 +255,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
if (arg1 != NULL)
restart_interval = atol (arg1);
else
- error (0, 0, _("Must specify value for restart-interval option"));
+ error (0, 0, _("Must specify value for restart-interval option"));
}
else if (strcmp (entry, "auto-propagate") == 0)
{