From 70f641f84527fcb5a2ccbff7c8e238003ff2d2f3 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 26 Jan 2016 18:36:26 +0000
Subject: [PATCH] Remove some unused variables.

Thanks to @ch3root again for this patch.
---
 contrib/cygtermd/main.c   | 2 +-
 contrib/cygtermd/telnet.c | 2 --
 sshcrc.c                  | 1 -
 windows/winsecur.c        | 4 ----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/contrib/cygtermd/main.c b/contrib/cygtermd/main.c
index acf35dd9..84e6c75e 100644
--- a/contrib/cygtermd/main.c
+++ b/contrib/cygtermd/main.c
@@ -111,7 +111,7 @@ void sig_readdata(sel_rfd *rfd, void *data, size_t len)
     while (len > 0) {
 	if (*p == 'C') {
 	    int status;
-	    pid_t pid = waitpid(-1, &status, WNOHANG);
+	    waitpid(-1, &status, WNOHANG);
 	    if (WIFEXITED(status) || WIFSIGNALED(status))
 		exit(0);	       /* child process vanished */
 	}
diff --git a/contrib/cygtermd/telnet.c b/contrib/cygtermd/telnet.c
index 7aec0aab..08487374 100644
--- a/contrib/cygtermd/telnet.c
+++ b/contrib/cygtermd/telnet.c
@@ -325,9 +325,7 @@ static void proc_rec_opt(Telnet telnet, int cmd, int option)
 
 static void process_subneg(Telnet telnet)
 {
-    unsigned char b[2048], *p, *q;
     int var, value, n;
-    char *e;
 
     switch (telnet->sb_opt) {
       case TELOPT_OLD_ENVIRON:
diff --git a/sshcrc.c b/sshcrc.c
index ed20395b..782d04bb 100644
--- a/sshcrc.c
+++ b/sshcrc.c
@@ -198,7 +198,6 @@ static const unsigned long crc32_table[256] = {
 #ifdef GENPROGRAM
 int main(void)
 {
-    unsigned long crcword;
     int i;
 
     crc32_init();
diff --git a/windows/winsecur.c b/windows/winsecur.c
index 8d0b223a..91ce7e92 100644
--- a/windows/winsecur.c
+++ b/windows/winsecur.c
@@ -140,8 +140,6 @@ int make_private_security_descriptor(DWORD permissions,
                                      PACL *acl,
                                      char **error)
 {
-    SID_IDENTIFIER_AUTHORITY world_auth = SECURITY_WORLD_SID_AUTHORITY;
-    SID_IDENTIFIER_AUTHORITY nt_auth = SECURITY_NT_AUTHORITY;
     EXPLICIT_ACCESS ea[3];
     int acl_err;
     int ret = FALSE;
@@ -225,8 +223,6 @@ int make_private_security_descriptor(DWORD permissions,
 
 int setprocessacl(char *error)
 {
-    SID_IDENTIFIER_AUTHORITY world_auth = SECURITY_WORLD_SID_AUTHORITY;
-    SID_IDENTIFIER_AUTHORITY nt_auth = SECURITY_NT_AUTHORITY;
     EXPLICIT_ACCESS ea[2];
     int acl_err;
     int ret=FALSE;