From: ben <ben@cda61777-01e9-0310-a592-d414129be87e>
Date: Sat, 11 Jan 2003 14:08:07 +0000 (+0000)
Subject: const fallout from Simon's X forwarding changes.
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/9b57f6ea289c28eddc723d91ae1cafd257d06666

const fallout from Simon's X forwarding changes.


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

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 45248185..60dd84e3 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -197,8 +197,8 @@ static pascal void mactcp_asr(StreamPtr, unsigned short, Ptr, unsigned short,
 static Plug mactcp_plug(Socket, Plug);
 static void mactcp_flush(Socket);
 static void mactcp_close(Socket);
-static int mactcp_write(Socket, char *, int);
-static int mactcp_write_oob(Socket, char *, int);
+static int mactcp_write(Socket, char const *, int);
+static int mactcp_write_oob(Socket, char const*, int);
 static void mactcp_set_private_ptr(Socket, void *);
 static void *mactcp_get_private_ptr(Socket);
 static char *mactcp_socket_error(Socket);
@@ -545,14 +545,18 @@ static void mactcp_close(Socket sock)
     sfree(s);
 }
 
-static int mactcp_write(Socket sock, char *buf, int len)
+static int mactcp_write(Socket sock, char const *buf, int len)
 {
     Actual_Socket s = (Actual_Socket) sock;
     wdsEntry wds[2];
     TCPiopb pb;
 
+    /* 
+     * Casting away const from buf should be safe -- MacTCP won't
+     * write to it.
+     */
     wds[0].length = len;
-    wds[0].ptr = buf;
+    wds[0].ptr = (char *)buf;
     wds[1].length = 0;
 
     pb.ioCRefNum = mactcp.refnum;
@@ -567,7 +571,7 @@ static int mactcp_write(Socket sock, char *buf, int len)
     return 0;
 }
 
-static int mactcp_write_oob(Socket sock, char *buf, int len)
+static int mactcp_write_oob(Socket sock, char const *buf, int len)
 {
 
     fatalbox("mactcp_write_oob");