[Sheepdog] [PATCH 09/12] shadow problem: daemon is defined in <unistd.h> but used as a local in a function

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Fri May 21 13:42:36 CEST 2010


Rename variable daemon to is_daemon.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 lib/logger.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/logger.c b/lib/logger.c
index 5779418..80646ed 100644
--- a/lib/logger.c
+++ b/lib/logger.c
@@ -361,7 +361,7 @@ static void log_flush(void)
 	}
 }
 
-int log_init(char *program_name, int size, int daemon, int level, char *outfile)
+int log_init(char *program_name, int size, int is_daemon, int level, char *outfile)
 {
 	log_level = level;
 
@@ -370,7 +370,7 @@ int log_init(char *program_name, int size, int daemon, int level, char *outfile)
 
 	semkey = random();
 
-	if (daemon) {
+	if (is_daemon) {
 		struct sigaction sa_old;
 		struct sigaction sa_new;
 		int fd;
-- 
1.5.6.5




More information about the sheepdog mailing list