From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 28 Jan 2020 10:30:23 +0000 (+0100)
Subject: starter: Avoid hiding global variable when checking PID file
X-Git-Tag: 5.8.3dr1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42928551ab2a059ffef42dec7f23c95aeef6818a;p=thirdparty%2Fstrongswan.git

starter: Avoid hiding global variable when checking PID file
---

diff --git a/src/starter/starter.c b/src/starter/starter.c
index 506fe47e23..8263661b25 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -255,14 +255,14 @@ static void fatal_signal_handler(int signal)
 	abort();
 }
 
-static bool check_pid(char *pid_file)
+static bool check_pid(char *file)
 {
 	struct stat stb;
 	FILE *pidfile;
 
-	if (stat(pid_file, &stb) == 0)
+	if (stat(file, &stb) == 0)
 	{
-		pidfile = fopen(pid_file, "r");
+		pidfile = fopen(file, "r");
 		if (pidfile)
 		{
 			char buf[64];
@@ -279,8 +279,8 @@ static bool check_pid(char *pid_file)
 				return TRUE;
 			}
 		}
-		DBG1(DBG_APP, "removing pidfile '%s', process not running", pid_file);
-		unlink(pid_file);
+		DBG1(DBG_APP, "removing pidfile '%s', process not running", file);
+		unlink(file);
 	}
 	return FALSE;
 }