Changeset 1454 for trunk/src/emx/src/libsocket/socket.c

Timestamp:

Sep 4, 2004, 8:22:38 AM (21 years ago)

Author:

bird

Message:

Joined with the fork() tree from netlabs.cvs.

File:

• trunk/src/emx/src/libsocket/socket.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/libsocket/socket.c

@@ -33 +33 @@
 #include <sys/fcntl.h>
 #include <emx/io.h>
+#include <os2emx.h>
+#include <InnoTekLIBC/sharedpm.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_SOCKET
 #include <InnoTekLIBC/logstrict.h>
@@ -46 +48 @@
     if (s >= 0)
     {
-        int             rc;
         int             fh;
-        PLIBCSOCKETFH   pFH;
-        rc = __libc_FHAllocate(-1, O_RDWR | F_SOCKET, sizeof(LIBCSOCKETFH), &__libsocket_gSocketOps, (PLIBCFH*)&pFH, &fh);
-        if (!rc)
-        {
-            pFH->iSocket = s;
+        PLIBCSOCKETFH   pFH = TCPNAMEG(AllocFH)(s, &fh);
+        if (pFH)
             LIBCLOG_RETURN_INT(fh);
-        }
         else
             __libsocket_soclose(s);
-        __libsocket_setSocketErrno();
+        __libc_TcpipSetSocketErrno();
     }
     else
-        __libsocket_setLibcErrno();
+        __libc_TcpipUpdateErrno();
 
     LIBCLOG_RETURN_INT(-1);