From 662ba32d351486a3ac99fa67821cd753fa39a6fb Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Thu, 31 Dec 2009 20:12:36 +0100 Subject: [PATCH] Fix ret/iret variables usage --- src/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.c b/src/main.c index 4e9a3af3..b4f5d780 100644 --- a/src/main.c +++ b/src/main.c @@ -95,9 +95,9 @@ daemonize(int background, char *pidfile) { FILE *fp; pid_t childpid; - pid_t ret; + pid_t pid_ret; int fd; - int iret; + int ret; char *runas; struct passwd *pw; @@ -153,8 +153,8 @@ daemonize(int background, char *pidfile) return -1; } - ret = setsid(); - if (ret == (pid_t) -1) + pid_ret = setsid(); + if (pid_ret == (pid_t) -1) { DPRINTF(E_FATAL, L_MAIN, "setsid() failed: %s\n", strerror(errno)); @@ -186,24 +186,24 @@ daemonize(int background, char *pidfile) if (pw) { - iret = initgroups(runas, pw->pw_gid); - if (iret != 0) + ret = initgroups(runas, pw->pw_gid); + if (ret != 0) { DPRINTF(E_FATAL, L_MAIN, "initgroups() failed: %s\n", strerror(errno)); return -1; } - iret = setgid(pw->pw_gid); - if (iret != 0) + ret = setgid(pw->pw_gid); + if (ret != 0) { DPRINTF(E_FATAL, L_MAIN, "setgid() failed: %s\n", strerror(errno)); return -1; } - iret = setuid(pw->pw_uid); - if (iret != 0) + ret = setuid(pw->pw_uid); + if (ret != 0) { DPRINTF(E_FATAL, L_MAIN, "setuid() failed: %s\n", strerror(errno));