Jimen Ching's patches to remove compiler warnings

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

diff --git a/putty.h b/putty.h
index d8cd3e0..0ca50aa 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -140,7 +140,7 @@ void do_text (Context, int, int, char *, int, unsigned long);
 void set_title (char *);
 void set_icon (char *);
 void set_sbar (int, int, int);
-Context get_ctx();
+Context get_ctx(void);
 void free_ctx (Context);
 void palette_set (int, int, int, int);
 void palette_reset (void);

diff --git a/ssh.c b/ssh.c
index 8f7b790..17a5923 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -76,7 +76,6 @@ static int s_read (char *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;
@@ -101,10 +100,8 @@ static void ssh_size(void);
 
 static void ssh_gotdata(unsigned char *data, int datalen) {
     static long len, biglen, to_read;
-    static unsigned char c, *p;
+    static unsigned char *p;
     static int i, pad;
-    static char padding[8];
-    static unsigned char word[4];
 
     crBegin;
     while (1) {

diff --git a/telnet.c b/telnet.c
index b6e4802..00b081b 100644 (file)
--- a/telnet.c
+++ b/telnet.c
@@ -171,7 +171,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/windlg.c b/windlg.c
index a700081..6302c55 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -42,8 +42,6 @@ static void mungestr(char *in, char *out) {
 }
 
 static void unmungestr(char *in, char *out) {
-    int candot = 0;
-
     while (*in) {
        if (*in == '%' && in[1] && in[2]) {
            int i, j;

diff --git a/window.c b/window.c
index 3eaa033..e8c4515 100644 (file)
--- a/window.c
+++ b/window.c
@@ -1412,7 +1412,7 @@ void set_sbar (int total, int start, int page) {
         SetScrollInfo (hwnd, SB_VERT, &si, TRUE);
 }
 
-Context get_ctx() {
+Context get_ctx(void) {
     HDC hdc;
     if (hwnd) {
        hdc = GetDC (hwnd);
@@ -1540,11 +1540,10 @@ void get_clip (void **p, int *len) {
  */
 void optimised_move (int to, int from, int lines) {
     RECT r;
-    int min, max, d;
+    int min, max;
 
     min = (to < from ? to : from);
     max = to + from - min;
-    d = max - min;
 
     r.left = 0; r.right = cols * font_width;
     r.top = min * font_height; r.bottom = (max+lines) * font_height;