From: Andreas Jaeger <aj@suse.de>
Date: Wed, 9 May 2012 15:41:25 +0000 (+0200)
Subject: Cleanup last patch for nscd/nscd.c
X-Git-Tag: glibc-2.16-tps~438
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91d8d69ec6bc407af06125c4c98f70e3a43f3b38;p=thirdparty%2Fglibc.git

Cleanup last patch for nscd/nscd.c

	* nscd/nscd.c (run_mode): Use enum.
	(main): Cleanup coding style issue.
---

diff --git a/ChangeLog b/ChangeLog
index 7cee81a6240..6d7243b27b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-09  Andreas Jaeger  <aj@suse.de>
+	    Pedro Alves  <palves@redhat.com>
+
+	* nscd/nscd.c (run_mode): Use enum.
+	(main): Cleanup coding style issue.
+
 2012-05-09  Alexandre Oliva  <aoliva@redhat.com>
 	    Andreas Jaeger  <aj@suse.de>
 
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 38a14210828..e22d8e83203 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -72,7 +72,7 @@ int do_shutdown;
 int disabled_passwd;
 int disabled_group;
 
-enum
+static enum
 {
   /* Running in foreground but otherwise behave like a daemon,
      i.e., detach from terminal and use syslog.  This allows
@@ -82,8 +82,7 @@ enum
   RUN_DAEMONIZE,
   /* Run in foreground in debug mode.  */
   RUN_DEBUG
-};
-static int run_mode = RUN_DAEMONIZE;
+} run_mode = RUN_DAEMONIZE;
 
 static const char *conffile = _PATH_NSCDCONF;
 
@@ -187,7 +186,7 @@ main (int argc, char **argv)
   /* Determine page size.  */
   pagesize_m1 = getpagesize () - 1;
 
-  if ((run_mode == RUN_DAEMONIZE) || (run_mode == RUN_FOREGROUND))
+  if (run_mode == RUN_DAEMONIZE || run_mode == RUN_FOREGROUND)
     {
       int i;
       pid_t pid;