Changeset 2925

Timestamp:

Dec 30, 2006, 5:03:06 AM (19 years ago)

Author:

bird

Message:

cleanup in progress (late night session)

File:

• trunk/libc/src/libsocket/soclose.c (modified) (2 diffs)

trunk/libc/src/libsocket/soclose.c

@@ -32 +32 @@
 #include <sys/socket.h>
 #include <sys/fcntl.h>
-#include <emx/io.h>
+#include <klibc/backend.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_SOCKET
-#include <InnoTekLIBC/logstrict.h>
+#include <klibc/logstrict.h>
 #include "socket.h"
 
@@ -40 +40 @@
 {
     LIBCLOG_ENTER("socket=%d\n", socket);
-    PLIBCSOCKETFH pFHSocket = __libc_TcpipFH(socket);
-    if (pFHSocket)
-    {
-        int rc = __libc_FHClose(socket)
-        if (!rc)
-            LIBCLOG_RETURN_INT(0);
-        /* Convert EBADF to ENOTSOCK (although this normally won't happen). */
-        if (rc == -EBADF)
-            rc = -ENOTSOCK;
-        __libc_TcpipSetErrno(-rc);
-    }
-
+    int rc = __libc_Back_ioClose(socket);
+    if (!rc)
+        LIBCLOG_RETURN_INT(0);
+    /* Convert EBADF to ENOTSOCK (although this normally won't happen). */
+    if (rc == -EBADF)
+        rc = -ENOTSOCK;
+    __libc_TcpipSetErrno(-rc);
     LIBCLOG_RETURN_INT(-1);
 }