X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=x11fwd.c;h=16944ee1bd9e1550c9b6dd609d6ff25e173f33fc;hb=6b362191f1a2c6897e7b7bfa80beec1cd1f722fd;hp=91d68d24675f34af5e08f208201cca20918b618e;hpb=3e4386d8109799fa298229bbe49f76738c9f3d14;p=PuTTY.git

diff --git a/x11fwd.c b/x11fwd.c
index 91d68d24..16944ee1 100644
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -174,7 +174,7 @@ static char *x11_verify(unsigned long peer_ip, int peer_port,
     return NULL;
 }
 
-static int x11_closing(Plug plug, char *error_msg, int error_code,
+static int x11_closing(Plug plug, const char *error_msg, int error_code,
 		       int calling_back)
 {
     struct X11Private *pr = (struct X11Private *) plug;
@@ -232,8 +232,8 @@ int x11_get_screen_number(char *display)
  * Returns an error message, or NULL on success.
  * also, fills the SocketsStructure
  */
-char *x11_init(Socket * s, char *display, void *c, void *auth,
-	       const char *peeraddr, int peerport, const Config *cfg)
+const char *x11_init(Socket * s, char *display, void *c, void *auth,
+		     const char *peeraddr, int peerport, const Config *cfg)
 {
     static const struct plug_function_table fn_table = {
 	x11_closing,
@@ -244,7 +244,8 @@ char *x11_init(Socket * s, char *display, void *c, void *auth,
 
     SockAddr addr;
     int port;
-    char *err, *dummy_realhost;
+    const char *err;
+    char *dummy_realhost;
     char host[128];
     int n, displaynum;
     struct X11Private *pr;
@@ -361,10 +362,10 @@ void x11_override_throttle(Socket s, int enable)
  */
 int x11_send(Socket s, char *data, int len)
 {
-    struct X11Private *pr = (struct X11Private *) sk_get_private_ptr(s);
-
-    if (s == NULL)
+    struct X11Private *pr;
+    if (!s)
 	return 0;
+    pr = (struct X11Private *) sk_get_private_ptr(s);
 
     /*
      * Read the first packet.