Cleanups to remove warnings for GNU/mingw32 compilation

git-svn-id: svn://svn.tartarus.org/sgt/putty@325 cda61777-01e9-0310-a592-d414129be87e

diff --git a/ldisc.c b/ldisc.c
index cb2764e..ca5625d 100644 (file)
--- a/ldisc.c
+++ b/ldisc.c
@@ -1,5 +1,6 @@
 #include <windows.h>
 #include <stdio.h>
+#include <ctype.h>
 
 #include "putty.h"
 

diff --git a/scp.c b/scp.c
index 075b731..299f6fd 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -164,7 +164,7 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
        eta = size - done;
     else
        eta = (unsigned long) ((size - done) / ratebs);
-    sprintf(etastr, "%02d:%02d:%02d",
+    sprintf(etastr, "%02ld:%02ld:%02ld",
            eta / 3600, (eta % 3600) / 60, eta % 60);
 
     pct = (int) (100.0 * (float) done / size);
@@ -457,7 +457,7 @@ static void sink(char *targ)
            ssh_send("", 1);
            return;
          case 'T':
-           if (sscanf(buf, "T%d %*d %d %*d",
+           if (sscanf(buf, "T%ld %*d %ld %*d",
                       &mtime, &atime) == 2) {
                settime = 1;
                ssh_send("", 1);
@@ -471,7 +471,7 @@ static void sink(char *targ)
            bump("Protocol error: Expected control record");
        }
 
-       if (sscanf(buf+1, "%u %u %[^\n]", &mode, &size, namebuf) != 3)
+       if (sscanf(buf+1, "%u %lu %[^\n]", &mode, &size, namebuf) != 3)
            bump("Protocol error: Illegal file descriptor format");
        if (targisdir) {
            char t[2048];

diff --git a/sizetip.c b/sizetip.c
index 321216a..b34b4f1 100644 (file)
--- a/sizetip.c
+++ b/sizetip.c
@@ -2,6 +2,7 @@
 #include <winreg.h>
 #include <tchar.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "putty.h"
 

diff --git a/windlg.c b/windlg.c
index 94b5514..47a8690 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -304,7 +304,7 @@ static void load_settings (char *section, int do_host) {
     gppi (sesskey, "FontIsBold", 0, &cfg.fontisbold);
     gppi (sesskey, "FontCharSet", ANSI_CHARSET, &cfg.fontcharset);
     gppi (sesskey, "FontHeight", 10, &cfg.fontheight);
-    gppi (sesskey, "FontVTMode", VT_POORMAN, &cfg.vtmode);
+    gppi (sesskey, "FontVTMode", VT_POORMAN, (int *)&cfg.vtmode);
     gppi (sesskey, "TryPalette", 0, &cfg.try_palette);
     gppi (sesskey, "BoldAsColour", 1, &cfg.bold_colour);
     for (i=0; i<22; i++) {
@@ -316,10 +316,14 @@ static void load_settings (char *section, int do_host) {
            "85,255,255", "187,187,187", "255,255,255"
        };
        char buf[20], buf2[30];
+       int c0, c1, c2;
        sprintf(buf, "Colour%d", i);
        gpps (sesskey, buf, defaults[i], buf2, sizeof(buf2));
-       sscanf(buf2, "%d,%d,%d", &cfg.colours[i][0],
-              &cfg.colours[i][1], &cfg.colours[i][2]);
+       if(sscanf(buf2, "%d,%d,%d", &c0, &c1, &c2) == 3) {
+           cfg.colours[i][0] = c0;
+           cfg.colours[i][1] = c1;
+           cfg.colours[i][2] = c2;
+       }
     }
     gppi (sesskey, "MouseIsXterm", 0, &cfg.mouse_is_xterm);
     for (i=0; i<256; i+=32) {
@@ -1122,7 +1126,7 @@ static int CALLBACK ColourProc (HWND hwnd, UINT msg,
                    i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);
                cc.lStructSize = sizeof(cc);
                cc.hwndOwner = hwnd;
-               cc.hInstance = hinst;
+               cc.hInstance = (HWND)hinst;
                cc.lpCustColors = custom;
                cc.rgbResult = RGB (cfg.colours[i][0], cfg.colours[i][1],
                                    cfg.colours[i][2]);

diff --git a/window.c b/window.c
index 4aae422..c7c652b 100644 (file)
--- a/window.c
+++ b/window.c
@@ -3,6 +3,7 @@
 #include <winsock.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #define PUTTY_DO_GLOBALS                      /* actually _define_ globals */
 #include "putty.h"
@@ -150,7 +151,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
             */
            HANDLE filemap;
            Config *cp;
-           if (sscanf(p+1, "%x", &filemap) == 1 &&
+           if (sscanf(p+1, "%p", &filemap) == 1 &&
                (cp = MapViewOfFile(filemap, FILE_MAP_READ,
                                    0, 0, sizeof(Config))) != NULL) {
                cfg = *cp;
@@ -671,7 +672,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
                            UnmapViewOfFile(p);
                        }
                    }
-                   sprintf(c, "putty &%08x", filemap);
+                   sprintf(c, "putty &%p", filemap);
                    cl = c;
                } else if (wParam == IDM_SAVEDSESS) {
                    char *session = sessions[(lParam - IDM_SAVED_MIN) / 16];