aboutsummaryrefslogtreecommitdiff
path: root/nscd/nscd.c
diff options
context:
space:
mode:
authorAndreas Jaeger <jaegerandi@gmail.com>2012-05-09 21:34:47 +0200
committerAndreas Jaeger <jaegerandi@gmail.com>2012-05-09 21:34:47 +0200
commitedfe0dbebdae0a41edc7f642a0dd349f172fd3e6 (patch)
tree145133414793501a9b58e6708837b4e460e3f68f /nscd/nscd.c
parentbdd74070cc94ca50f1096808977268981308d7d6 (diff)
downloadglibc-edfe0dbebdae0a41edc7f642a0dd349f172fd3e6.zip
glibc-edfe0dbebdae0a41edc7f642a0dd349f172fd3e6.tar.gz
glibc-edfe0dbebdae0a41edc7f642a0dd349f172fd3e6.tar.bz2
Cleanup nscd.c
2012-05-09 Andreas Jaeger <aj@suse.de> * nscd/nscd.c (run_modes): Make named enum, reorder so that default is first entry. (run_mode): Set type. (main): Remove informal message about syslog. (options): Fix typo.
Diffstat (limited to 'nscd/nscd.c')
-rw-r--r--nscd/nscd.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/nscd/nscd.c b/nscd/nscd.c
index e22d8e8..79fb32f 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -72,17 +72,19 @@ int do_shutdown;
int disabled_passwd;
int disabled_group;
-static enum
+typedef enum
{
+ /* Running in background as daemon. */
+ RUN_DAEMONIZE,
/* Running in foreground but otherwise behave like a daemon,
i.e., detach from terminal and use syslog. This allows
better integration with services like systemd. */
RUN_FOREGROUND,
- /* Running in background as daemon. */
- RUN_DAEMONIZE,
/* Run in foreground in debug mode. */
RUN_DEBUG
-} run_mode = RUN_DAEMONIZE;
+} run_modes;
+
+static run_modes run_mode = RUN_DAEMONIZE;
static const char *conffile = _PATH_NSCDCONF;
@@ -115,7 +117,7 @@ static const struct argp_option options[] =
{ "debug", 'd', NULL, 0,
N_("Do not fork and display messages on the current tty") },
{ "foreground", 'F', NULL, 0,
- N_("Do not fork, but otherwise behave like a deamon") },
+ N_("Do not fork, but otherwise behave like a daemon") },
{ "nthreads", 't', N_("NUMBER"), 0, N_("Start NUMBER threads") },
{ "shutdown", 'K', NULL, 0, N_("Shut the server down") },
{ "statistics", 'g', NULL, 0, N_("Print current configuration statistics") },
@@ -200,8 +202,6 @@ main (int argc, char **argv)
if (pid != 0)
exit (0);
}
- else
- fprintf (stderr, _("further output sent to syslog\n"));
int nullfd = open (_PATH_DEVNULL, O_RDWR);
if (nullfd != -1)