From: Marc Hoersken <info@marc-hoersken.de>
Date: Fri, 23 Jul 2021 20:14:32 +0000 (+0200)
Subject: tests/servers: remove obsolete pid variable
X-Git-Tag: curl-7_79_0~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a7bf79fcc2c7d0414d7d0a2bdc8fe4f1265739b;p=thirdparty%2Fcurl.git

tests/servers: remove obsolete pid variable

Variable is not used since pidfile handling moved to util.[ch]

Reviewed-by: Jay Satiro
Closes #7482
---

diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 4edaeb86a8..30afe48b26 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -1053,7 +1053,6 @@ int main(int argc, char *argv[])
   int rc;
   int error;
   int arg = 1;
-  long pid;
 
   memset(&req, 0, sizeof(req));
 
@@ -1136,8 +1135,6 @@ int main(int argc, char *argv[])
 
   install_signal_handlers(false);
 
-  pid = (long)getpid();
-
 #ifdef ENABLE_IPV6
   if(!use_ipv6)
 #endif
@@ -1377,7 +1374,7 @@ server_cleanup:
 
   if(got_exit_signal) {
     logmsg("========> %s rtspd (port: %d pid: %ld) exits with signal (%d)",
-           ipv_inuse, (int)port, pid, exit_signal);
+           ipv_inuse, (int)port, (long)getpid(), exit_signal);
     /*
      * To properly set the return status of the process we
      * must raise the same signal SIGINT or SIGTERM that we
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 3fc913b3f8..324c38a2a8 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -1881,7 +1881,6 @@ int main(int argc, char *argv[])
   int rc = 0;
   int error;
   int arg = 1;
-  long pid;
   const char *connecthost = "127.0.0.1";
   const char *socket_type = "IPv4";
   char port_str[11];
@@ -2020,8 +2019,6 @@ int main(int argc, char *argv[])
 
   install_signal_handlers(false);
 
-  pid = (long)getpid();
-
   sock = socket(socket_domain, SOCK_STREAM, 0);
 
   all_sockets[0] = sock;
@@ -2366,7 +2363,7 @@ sws_cleanup:
 
   if(got_exit_signal) {
     logmsg("========> %s sws (%s pid: %ld) exits with signal (%d)",
-           socket_type, location_str, pid, exit_signal);
+           socket_type, location_str, (long)getpid(), exit_signal);
     /*
      * To properly set the return status of the process we
      * must raise the same signal SIGINT or SIGTERM that we
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 8caa3491f0..2a0818a198 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -555,7 +555,6 @@ int main(int argc, char **argv)
   int flag;
   int rc;
   int error;
-  long pid;
   struct testcase test;
   int result = 0;
 
@@ -637,8 +636,6 @@ int main(int argc, char **argv)
 
   install_signal_handlers(true);
 
-  pid = (long)getpid();
-
 #ifdef ENABLE_IPV6
   if(!use_ipv6)
 #endif
@@ -861,7 +858,7 @@ tftpd_cleanup:
 
   if(got_exit_signal) {
     logmsg("========> %s tftpd (port: %d pid: %ld) exits with signal (%d)",
-           ipv_inuse, (int)port, pid, exit_signal);
+           ipv_inuse, (int)port, (long)getpid(), exit_signal);
     /*
      * To properly set the return status of the process we
      * must raise the same signal SIGINT or SIGTERM that we