Consequences of Simon's recent deglobalisation changes.

[u/mdw/putty] / mac / mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 91b402d..6cddc10 100644 (file)
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -244,7 +244,7 @@ OSErr mactcp_init(void)
     return noErr;
 }
 
-void mactcp_shutdown(void)
+void mactcp_cleanup(void)
 {
     Actual_Socket s, next;
 
@@ -270,7 +270,7 @@ void mactcp_shutdown(void)
 
 static ResultUPP mactcp_lookupdone_upp;
 
-SockAddr mactcp_namelookup(char *host, char **canonicalname)
+SockAddr mactcp_namelookup(char const *host, char **canonicalname)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
     OSErr err;
@@ -281,7 +281,8 @@ SockAddr mactcp_namelookup(char *host, char **canonicalname)
     memset(ret, 0, sizeof(struct SockAddr_tag));
     if (mactcp_lookupdone_upp == NULL)
        mactcp_lookupdone_upp = NewResultUPP(&mactcp_lookupdone);
-    err = StrToAddr(host, &ret->hostinfo, mactcp_lookupdone_upp,
+    /* Casting away const -- hope StrToAddr is sensible */
+    err = StrToAddr((char *)host, &ret->hostinfo, mactcp_lookupdone_upp,
                    (char *)&done);
     /*
      * PuTTY expects DNS lookups to be synchronous (see bug
@@ -308,7 +309,7 @@ static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie)
     *donep = TRUE;
 }
 
-SockAddr mactcp_nonamelookup(char *host)
+SockAddr mactcp_nonamelookup(char const *host)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
 
@@ -504,7 +505,8 @@ Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline,
     /* Add this to the list of all sockets */
     ret->next = mactcp.socklist;
     ret->prev = &mactcp.socklist;
-    ret->next->prev = &ret->next;
+    if (ret->next != NULL)
+       ret->next->prev = &ret->next;
     mactcp.socklist = ret;
 
     return (Socket)ret;