From: Sami Kerola <kerolasa@iki.fi>
Date: Mon, 8 Aug 2016 10:33:16 +0000 (+0200)
Subject: uuidd: remove unnecessary pidpile path variable
X-Git-Tag: v2.29-rc1~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7a245e27af6053c262a0e16438d4ab2ebb48016;p=thirdparty%2Futil-linux.git

uuidd: remove unnecessary pidpile path variable

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index a3fe830442..49cf9dc51e 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -543,7 +543,6 @@ int main(int argc, char **argv)
 {
 	const char	*socket_path = UUIDD_SOCKET_PATH;
 	const char	*pidfile_path = NULL;
-	const char	*pidfile_path_param = NULL;
 	const char	*err_context = NULL;
 	char		buf[1024], *cp;
 	char		str[UUID_STR_LEN];
@@ -601,7 +600,7 @@ int main(int argc, char **argv)
 						_("failed to parse --uuids"));
 			break;
 		case 'p':
-			pidfile_path_param = optarg;
+			pidfile_path = optarg;
 			break;
 		case 'P':
 			no_pid = 1;
@@ -646,10 +645,8 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (!no_pid && !pidfile_path_param)
+	if (!no_pid && !pidfile_path)
 		pidfile_path = UUIDD_PIDFILE_PATH;
-	else if (pidfile_path_param)
-		pidfile_path = pidfile_path_param;
 
 	/* custom socket path and socket-activation make no sense */
 	if (s_flag && uuidd_cxt.no_sock && !uuidd_cxt.quiet)