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

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 5c256655..7644ddf5 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>
@@ -130,8 +132,9 @@ typedef CALLBACK_API_C(OSErr, AddrToStrProcPtr)(UInt32, unsigned long, char *);
 typedef STACK_UPP_TYPE(AddrToStrProcPtr) AddrToStrUPP;
 enum { uppAddrToStrProcInfo = kCStackBased
        | RESULT_SIZE(SIZE_CODE(sizeof(OSErr)))
-       | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(unsigned long)))
-       | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
+       | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(UInt32)))
+       | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(unsigned long)))
+       | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(char *)))
 };
 #define InvokeAddrToStrUPP(selector, addr, addrStr, userUPP)		\
     CALL_THREE_PARAMETER_UPP((userUPP), uppAddrToStrProcInfo, (selector),\
@@ -272,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;
@@ -302,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;
 }
@@ -316,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;
@@ -429,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;
@@ -470,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;
@@ -828,13 +831,7 @@ OSErr CloseResolver(void)
     return noErr;
 }
 
-/* MacTCP doesn't have a services database. */
-int net_service_lookup(char *service)
-{
-
-    return 0;
-}
-
+#endif
 
 /*
  * Local Variables: