From 996c8c3b71ae7d62c5da27e40d6771f1d17c584b Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Wed, 8 Mar 2000 10:21:13 +0000
Subject: [PATCH] Fix some picky compiler warnings kindly provided by Borland
 C++ 5.5

git-svn-id: svn://svn.tartarus.org/sgt/putty@396 cda61777-01e9-0310-a592-d414129be87e
---
 ldisc.c  |  1 -
 raw.c    |  1 -
 scp.c    | 14 +++++++-------
 scpssh.c |  2 +-
 sshrsa.c |  3 ++-
 window.c | 18 +++++++++---------
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/ldisc.c b/ldisc.c
index ca5625d6..48879d8a 100644
--- a/ldisc.c
+++ b/ldisc.c
@@ -11,7 +11,6 @@
 static void c_write (char *buf, int len) {
     while (len--) {
 	int new_head = (inbuf_head + 1) & INBUF_MASK;
-	int c = (unsigned char) *buf;
 	if (new_head != inbuf_reap) {
 	    inbuf[inbuf_head] = *buf++;
 	    inbuf_head = new_head;
diff --git a/raw.c b/raw.c
index 31c1746a..3023d95a 100644
--- a/raw.c
+++ b/raw.c
@@ -52,7 +52,6 @@ static void s_write (void *buf, int len) {
 static void c_write (char *buf, int len) {
     while (len--) {
 	int new_head = (inbuf_head + 1) & INBUF_MASK;
-	int c = (unsigned char) *buf;
 	if (new_head != inbuf_reap) {
 	    inbuf[inbuf_head] = *buf++;
 	    inbuf_head = new_head;
diff --git a/scp.c b/scp.c
index f359c6e8..8a82b2f7 100644
--- a/scp.c
+++ b/scp.c
@@ -270,7 +270,7 @@ static void source(char *src)
     time_t stat_starttime, stat_lasttime;
 
     attr = GetFileAttributes(src);
-    if (attr == -1) {
+    if (attr == (DWORD)-1) {
 	run_err("%s: No such file or directory", src);
 	return;
     }
@@ -425,7 +425,7 @@ static void sink(char *targ)
     char namebuf[2048];
     char ch;
     int targisdir = 0;
-    int settime = 0;
+    int settime;
     int exists;
     DWORD attr;
     HANDLE f;
@@ -438,7 +438,7 @@ static void sink(char *targ)
     char *stat_name;
 
     attr = GetFileAttributes(targ);
-    if (attr != -1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
+    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
 	targisdir = 1;
 
     if (targetshouldbedirectory && !targisdir)
@@ -498,7 +498,7 @@ static void sink(char *targ)
 	    strcpy(namebuf, targ);
 	}
 	attr = GetFileAttributes(namebuf);
-	exists = (attr != -1);
+	exists = (attr != (DWORD)-1);
 
 	if (buf[0] == 'D') {
 	    if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
@@ -540,7 +540,7 @@ static void sink(char *targ)
 
 	for (i = 0; i < size; i += 4096) {
 	    char transbuf[4096];
-	    int j, k = 4096;
+	    DWORD j, k = 4096;
 	    if (i + k > size) k = size - i;
 	    if (ssh_recv(transbuf, k) == 0)
 		bump("Lost connection");
@@ -732,7 +732,7 @@ static void tolocal(int argc, char *argv[])
 /*
  *  Initialize the Win$ock driver.
  */
-static void init_winsock()
+static void init_winsock(void)
 {
     WORD winsock_ver;
     WSADATA wsadata;
@@ -748,7 +748,7 @@ static void init_winsock()
 /*
  *  Short description of parameters.
  */
-static void usage()
+static void usage(void)
 {
     printf("PuTTY Secure Copy client\n");
     printf("%s\n", ver);
diff --git a/scpssh.c b/scpssh.c
index 0447af36..5db056a4 100644
--- a/scpssh.c
+++ b/scpssh.c
@@ -88,7 +88,7 @@ static int s_read (char *buf, int len) {
 /*
  * Read and decrypt one incoming SSH packet.
  */
-static void get_packet()
+static void get_packet(void)
 {
     unsigned char buf[4];
     int ret;
diff --git a/sshrsa.c b/sshrsa.c
index 71e1d634..3a017c29 100644
--- a/sshrsa.c
+++ b/sshrsa.c
@@ -126,7 +126,8 @@ static void bigmod(unsigned short *a, unsigned short *m, int len)
 	    q--;
 	    t -= m1;
 	    r = (r + m0) & 0xffff; /* overflow? */
-	    if (r >= m0 && t > ((unsigned long) r << 16) + a[i+1])
+	    if (r >= (unsigned long)m0 &&
+                t > ((unsigned long) r << 16) + a[i+1])
 		q--;
 	}
 
diff --git a/window.c b/window.c
index c4ee8de9..89631a36 100644
--- a/window.c
+++ b/window.c
@@ -37,7 +37,7 @@
 #define WM_IGNORE_SIZE (WM_USER + 2)
 #define WM_IGNORE_CLIP (WM_USER + 3)
 
-static int WINAPI WndProc (HWND, UINT, WPARAM, LPARAM);
+static LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
 static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output);
 static void cfgtopalette(void);
 static void init_palette(void);
@@ -622,8 +622,8 @@ static void click (Mouse_Button b, int x, int y) {
     lasttime = thistime;
 }
 
-static int WINAPI WndProc (HWND hwnd, UINT message,
-			   WPARAM wParam, LPARAM lParam) {
+static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
+                                 WPARAM wParam, LPARAM lParam) {
     HDC hdc;
     static int ignore_size = FALSE;
     static int ignore_clip = FALSE;
@@ -902,11 +902,11 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	ignore_size = TRUE;	       /* don't panic on next WM_SIZE msg */
 	break;
       case WM_ENTERSIZEMOVE:
-          EnableSizeTip(1);
-          break;
+        EnableSizeTip(1);
+        break;
       case WM_EXITSIZEMOVE:
-          EnableSizeTip(0);
-          break;
+        EnableSizeTip(0);
+        break;
       case WM_SIZING:
 	{
 	    int width, height, w, h, ew, eh;
@@ -916,7 +916,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    height = r->bottom - r->top - extra_height;
 	    w = (width + font_width/2) / font_width; if (w < 1) w = 1;
 	    h = (height + font_height/2) / font_height; if (h < 1) h = 1;
-        UpdateSizeTip(hwnd, w, h);
+            UpdateSizeTip(hwnd, w, h);
 	    ew = width - w * font_width;
 	    eh = height - h * font_height;
 	    if (ew != 0) {
@@ -940,7 +940,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    else
 		return 0;
 	}
-	break;
+        /* break;  (never reached) */
       case WM_SIZE:
 	if (wParam == SIZE_MINIMIZED) {
 	    SetWindowText (hwnd,
-- 
2.11.0