sshsha.c and sshmd5.c compile fine on PowerPC now.

[u/mdw/putty] / x11fwd.c

diff --git a/x11fwd.c b/x11fwd.c
index 4b043fa..d21441b 100644 (file)
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -204,7 +204,7 @@ char *x11_init(Socket * s, char *display, void *c, void *auth)
      * Try to find host.
      */
     addr = name_lookup(host, port, &dummy_realhost);
-    if ((err = sk_addr_error(addr)))
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     port = 6000 + displaynum;
@@ -222,7 +222,7 @@ char *x11_init(Socket * s, char *display, void *c, void *auth)
     pr->c = c;
 
     pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
-    if ((err = sk_socket_error(*s))) {
+    if ((err = sk_socket_error(*s)) != NULL) {
        sfree(pr);
        return err;
     }
@@ -299,7 +299,7 @@ int x11_send(Socket s, char *data, int len)
        pr->auth_dsize = (pr->auth_dlen + 3) & ~3;
        /* Leave room for a terminating zero, to make our lives easier. */
        pr->auth_protocol = (char *) smalloc(pr->auth_psize + 1);
-       pr->auth_data = (char *) smalloc(pr->auth_dsize);
+       pr->auth_data = (unsigned char *) smalloc(pr->auth_dsize);
     }
 
     /*
@@ -338,7 +338,7 @@ int x11_send(Socket s, char *data, int len)
            PUT_16BIT(pr->firstpkt[0], reply + 6, msgsize >> 2);/* data len */
            memset(reply + 8, 0, msgsize);
            memcpy(reply + 8, message, msglen);
-           sshfwd_write(pr->c, reply, 8 + msgsize);
+           sshfwd_write(pr->c, (char *)reply, 8 + msgsize);
            sshfwd_close(pr->c);
            x11_close(s);
            return 0;
@@ -351,7 +351,7 @@ int x11_send(Socket s, char *data, int len)
         */
        PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 6, 0);        /* auth proto */
        PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 8, 0);        /* auth data */
-       sk_write(s, pr->firstpkt, 12);
+       sk_write(s, (char *)pr->firstpkt, 12);
        pr->verified = 1;
     }