Changeset 1798 for trunk/src

Timestamp:

Nov 21, 1999, 4:22:18 PM (26 years ago)

Author:

phaller

Message:

Fix: few error handling issues

File:

• trunk/src/wsock32/wsock32.cpp (modified) (6 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.13 1999-11-10 16:39:46 phaller Exp $ */
+/* $Id: wsock32.cpp,v 1.14 1999-11-21 15:22:18 phaller Exp $ */
 
 /*
@@ -92 +92 @@
 #endif
 
-
-// forwarder prototypes
-void _System SetLastError(int iError);
-int  _System GetLastError(void);
 
 
@@ -128 +124 @@
  * Local variables                                                           *
  *****************************************************************************/
-
-// @@@PH not reentrancy proof
-//<_sandervl> phs: I already have a rewrite of the error support in wsock. Use the
-//            GetThreadTHDB export in kernel32 and add a DWORD to the thread
-//            structure in include\win\thread.h
 
 typedef struct tagWsockThreadData
@@ -983 +974 @@
                                  int,   namelen)
 {
-  return gethostname(name,namelen);
+  int rc = gethostname(name,namelen);
+  
+  if (rc == SOCKET_ERROR)
+    WSASetLastError(ERROR_SUCCESS);
+  else
+    WSASetLastError(iTranslateSockErrToWSock(sock_errno()));
+  
+  return (rc);
 }
 
@@ -1192 +1190 @@
   }
   else
-    return(iTranslateSockErrToWSock(sock_errno()));
+  {
+    WSASetLastError(iTranslateSockErrToWSock(sock_errno()));
+    return(WSASYSNOTREADY);
+  }
 }
 
@@ -1210 +1211 @@
 ODINFUNCTION0(int,OS2WSACleanup)
 {
+  WSASetLastError(ERROR_SUCCESS);
   return 0;
 }