X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1d81a7b61a209e7ab114d4aadd4e9a8b318f83dc..f85e6f6edb2c9415bc10bd2015479d72ea8c5ae2:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index f355232f..a8404b7a 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -27,6 +27,8 @@
  * mtcpnet.c - MacTCP interface
  */
 
+#if !TARGET_API_MAC_CARBON
+
 #include <MacTypes.h>
 #include <Devices.h>
 #include <Endian.h>
@@ -215,7 +217,7 @@ 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);
+static const char *mactcp_socket_error(Socket);
 static void mactcp_set_frozen(Socket, int);
 
 static void mactcp_recv(Actual_Socket s, size_t len);
@@ -273,7 +275,7 @@ static ResultUPP mactcp_lookupdone_upp;
 
 SockAddr mactcp_namelookup(char const *host, char **canonicalname)
 {
-    SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
+    SockAddr ret = snew(struct SockAddr_tag);
     OSErr err;
     volatile int done = FALSE;
     char *realhost;
@@ -303,7 +305,7 @@ SockAddr mactcp_namelookup(char const *host, char **canonicalname)
 	    realhost[realhostlen - 1] = '\0';
     } else
 	realhost = "";
-    *canonicalname = smalloc(1+strlen(realhost));
+    *canonicalname = snewn(1 + strlen(realhost), char);
     strcpy(*canonicalname, realhost);
     return ret;
 }
@@ -317,7 +319,7 @@ static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie)
 
 SockAddr mactcp_nonamelookup(char const *host)
 {
-    SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
+    SockAddr ret = snew(struct SockAddr_tag);
 
     ret->resolved = FALSE;
     ret->hostinfo.rtnCode = noErr;
@@ -430,7 +432,7 @@ Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline,
     /*
      * Create Socket structure.
      */
-    ret = smalloc(sizeof(struct Socket_tag));
+    ret = snew(struct Socket_tag);
     ret->s = 0;
     ret->fn = &fn_table;
     ret->err = noErr;
@@ -471,7 +473,7 @@ Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline,
     GetCurrentProcess(&mactcp.self);
     pb.ioCRefNum = mactcp.refnum;
     pb.csCode = TCPCreate;
-    pb.csParam.create.rcvBuff = smalloc(buflen);
+    pb.csParam.create.rcvBuff = snewn(buflen, char);
     pb.csParam.create.rcvBuffLen = buflen;
     pb.csParam.create.notifyProc = mactcp_asr_upp;
     pb.csParam.create.userDataPtr = (Ptr)ret;
@@ -515,6 +517,8 @@ Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline,
 	ret->next->prev = &ret->next;
     mactcp.socklist = ret;
 
+    sk_addr_free(addr); /* don't need this anymore */
+
     return (Socket)ret;
 }
 
@@ -712,7 +716,7 @@ char *mactcp_addr_error(SockAddr addr)
     }
 }
 
-static char *mactcp_socket_error(Socket sock)
+static const char *mactcp_socket_error(Socket sock)
 {
     static char buf[64];
     Actual_Socket s = (Actual_Socket) sock;
@@ -829,13 +833,7 @@ OSErr CloseResolver(void)
     return noErr;
 }
 
-/* MacTCP doesn't have a services database. */
-int net_service_lookup(char *service)
-{
-
-    return 0;
-}
-
+#endif
 
 /*
  * Local Variables: