AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-08 18:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup nscd.c

Browse Source 
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.
This commit is contained in:
Andreas Jaeger 2012-05-09 21:34:47 +02:00
parent bdd74070cc
commit edfe0dbebd
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2012-05-09 Andreas Jaeger <aj@suse.de> 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.
[BZ #14053] [BZ #14053]
* sysdeps/x86_64/fpu/bits/mathinline.h (lrintf): Add __volatile * sysdeps/x86_64/fpu/bits/mathinline.h (lrintf): Add __volatile
to asm. to asm.

14
nscd/nscd.c
View File

@ -72,17 +72,19 @@ int do_shutdown;
int disabled_passwd; int disabled_passwd;
int disabled_group; int disabled_group;
static enum typedef enum
{ {
/* Running in background as daemon. */
RUN_DAEMONIZE,
/* Running in foreground but otherwise behave like a daemon, /* Running in foreground but otherwise behave like a daemon,
i.e., detach from terminal and use syslog. This allows i.e., detach from terminal and use syslog. This allows
better integration with services like systemd. */ better integration with services like systemd. */
RUN_FOREGROUND, RUN_FOREGROUND,
/* Running in background as daemon. */
RUN_DAEMONIZE,
/* Run in foreground in debug mode. */ /* Run in foreground in debug mode. */
RUN_DEBUG RUN_DEBUG
} run_mode = RUN_DAEMONIZE; } run_modes;
static run_modes run_mode = RUN_DAEMONIZE;
static const char *conffile = _PATH_NSCDCONF; static const char *conffile = _PATH_NSCDCONF;
@ -115,7 +117,7 @@ static const struct argp_option options[] =
{ "debug", 'd', NULL, 0, { "debug", 'd', NULL, 0,
N_("Do not fork and display messages on the current tty") }, N_("Do not fork and display messages on the current tty") },
{ "foreground", 'F', NULL, 0, { "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") }, { "nthreads", 't', N_("NUMBER"), 0, N_("Start NUMBER threads") },
{ "shutdown", 'K', NULL, 0, N_("Shut the server down") }, { "shutdown", 'K', NULL, 0, N_("Shut the server down") },
{ "statistics", 'g', NULL, 0, N_("Print current configuration statistics") }, { "statistics", 'g', NULL, 0, N_("Print current configuration statistics") },
@ -200,8 +202,6 @@ main (int argc, char **argv)
if (pid != 0) if (pid != 0)
exit (0); exit (0);
} }
else
fprintf (stderr, _("further output sent to syslog\n"));
int nullfd = open (_PATH_DEVNULL, O_RDWR); int nullfd = open (_PATH_DEVNULL, O_RDWR);
if (nullfd != -1) if (nullfd != -1)