From cdcbdf3b83c8a1e4db0b149e818cd24e3596cf2c Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 28 Aug 2001 08:08:43 +0000
Subject: [PATCH] Fix various small compiler warnings, mostly unused local
 variables

git-svn-id: svn://svn.tartarus.org/sgt/putty@1218 cda61777-01e9-0310-a592-d414129be87e
---
 pageant.c  | 2 ++
 plink.c    | 4 ----
 scp.c      | 8 ++------
 settings.c | 2 +-
 ssh.c      | 2 +-
 winctrls.c | 3 +--
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pageant.c b/pageant.c
index fc5e8791..503cb857 100644
--- a/pageant.c
+++ b/pageant.c
@@ -74,6 +74,8 @@ int random_byte(void)
 {
     MessageBox(hwnd, "Internal Error", APPNAME, MB_OK | MB_ICONERROR);
     exit(0);
+    /* this line can't be reached but it placates MSVC's warnings :-) */
+    return 0;
 }
 
 /*
diff --git a/plink.c b/plink.c
index d8ef32b3..461035a2 100644
--- a/plink.c
+++ b/plink.c
@@ -314,11 +314,7 @@ void try_output(int is_stderr)
 
 int from_backend(int is_stderr, char *data, int len)
 {
-    int pos;
-    DWORD ret;
     HANDLE h = (is_stderr ? errhandle : outhandle);
-    void *writedata;
-    int writelen;
     int osize, esize;
 
     if (is_stderr) {
diff --git a/scp.c b/scp.c
index 8b71390e..250e229a 100644
--- a/scp.c
+++ b/scp.c
@@ -772,14 +772,13 @@ void scp_sftp_listdir(char *dirname)
     struct fxp_names *names;
     struct fxp_name *ournames;
     int nnames, namesize;
-    char *dir;
     int i;
 
     printf("Listing directory %s\n", dirname);
 
     dirh = fxp_opendir(dirname);
     if (dirh == NULL) {
-	printf("Unable to open %s: %s\n", dir, fxp_error());
+	printf("Unable to open %s: %s\n", dirname, fxp_error());
     } else {
 	nnames = namesize = 0;
 	ournames = NULL;
@@ -790,7 +789,7 @@ void scp_sftp_listdir(char *dirname)
 	    if (names == NULL) {
 		if (fxp_error_type() == SSH_FX_EOF)
 		    break;
-		printf("Reading directory %s: %s\n", dir, fxp_error());
+		printf("Reading directory %s: %s\n", dirname, fxp_error());
 		break;
 	    }
 	    if (names->nnames == 0) {
@@ -1689,9 +1688,7 @@ static void rsource(char *src)
 static void sink(char *targ, char *src)
 {
     char *destfname;
-    char ch;
     int targisdir = 0;
-    int settime;
     int exists;
     DWORD attr;
     HANDLE f;
@@ -1974,7 +1971,6 @@ static void toremote(int argc, char *argv[])
 	    continue;
 	}
 	do {
-	    char *last;
 	    char *filename;
 	    /*
 	     * Ensure that . and .. are never matched by wildcards,
diff --git a/settings.c b/settings.c
index 59db54d3..989eedd3 100644
--- a/settings.c
+++ b/settings.c
@@ -81,7 +81,7 @@ static void gprefs(void *sesskey, char *name, char *def,
     } while (n < nvals);
     /* Add any missing values (backward compatibility ect). */
     {
-	int i, j;
+	int i;
 	for (i = 0; i < nvals; i++) {
 	    if (!(seen & 1<<mapping[i].v)) {
 		array[n] = mapping[i].v;
diff --git a/ssh.c b/ssh.c
index efc28ef6..b0f16518 100644
--- a/ssh.c
+++ b/ssh.c
@@ -507,7 +507,7 @@ static int ssh_rportcmp_ssh2(void *av, void *bv)
 {
     struct ssh_rportfwd *a = (struct ssh_rportfwd *) av;
     struct ssh_rportfwd *b = (struct ssh_rportfwd *) bv;
-    int i;
+
     if (a->sport > b->sport)
 	return +1;
     if (a->sport < b->sport)
diff --git a/winctrls.c b/winctrls.c
index 61821c31..de4812c7 100644
--- a/winctrls.c
+++ b/winctrls.c
@@ -159,7 +159,6 @@ void multiedit(struct ctlpos *cp, ...)
 void dropdownlist(struct ctlpos *cp, char *text, int staticid, int listid)
 {
     RECT r;
-    va_list ap;
 
     r.left = GAPBETWEEN;
     r.right = cp->width;
@@ -995,7 +994,7 @@ int handle_prefslist(struct prefslist *hdl,
 
     if (is_dlmsg) {
 
-        if (wParam == hdl->listid) {
+        if ((int)wParam == hdl->listid) {
             DRAGLISTINFO *dlm = (DRAGLISTINFO *)lParam;
             int dest;
             switch (dlm->uNotification) {
-- 
2.11.0