Changeset 10005 for trunk/src/msvcrt/errno.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (22 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/errno.c (modified) (6 diffs)

trunk/src/msvcrt/errno.c

@@ -38 +38 @@
 void MSVCRT__set_errno(int err)
 {
-  int *errno = MSVCRT__errno();
-  unsigned long *doserrno = __doserrno();
-
+  int *msv_errno = MSVCRT__errno();
+  unsigned long *doserrno = MSVCRT_doserrno();
+ 
   *doserrno = err;
 
@@ -46 +46 @@
   {
 #define ERR_CASE(oserr) case oserr:
-#define ERR_MAPS(oserr,crterr) case oserr:*errno = crterr;break;
+#define ERR_MAPS(oserr,crterr) case oserr:*msv_errno = crterr;break;
     ERR_CASE(ERROR_ACCESS_DENIED)
     ERR_CASE(ERROR_NETWORK_ACCESS_DENIED)
@@ -91 +91 @@
     /*  Remaining cases map to EINVAL */
     /* FIXME: may be missing some errors above */
-    *errno = MSVCRT_EINVAL;
+    *msv_errno = MSVCRT_EINVAL;
   }
 }
@@ -100 +100 @@
 int* MSVCRT__errno(void)
 {
-    return &msvcrt_get_thread_data()->errno;
+    dprintf(("MSVCRT: __errno %d",msvcrt_get_thread_data()->msv_errno));  
+    return &msvcrt_get_thread_data()->msv_errno;
 }
 
 /*********************************************************************
- *              __doserrno (MSVCRT.@)
+ *              MSVCRT_doserrno (MSVCRT.@)
  */
-unsigned long* __doserrno(void)
+unsigned long* MSVCRT_doserrno(void)
 {
+    dprintf(("MSVCRT: _doserrno %d",msvcrt_get_thread_data()->doserrno));  
     return &msvcrt_get_thread_data()->doserrno;
 }
@@ -122 +124 @@
  *              _strerror       (MSVCRT.@)
  */
-char* _strerror(const char* err)
+char* MSVCRT__strerror(const char* err)
 {
   static char strerrbuff[256]; /* FIXME: Per thread, nprintf */
-  sprintf(strerrbuff,"%s: %s\n",err,MSVCRT_strerror(msvcrt_get_thread_data()->errno));
+  sprintf(strerrbuff,"%s: %s\n",err,MSVCRT_strerror(msvcrt_get_thread_data()->msv_errno));
   return strerrbuff;
 }
@@ -134 +136 @@
 void MSVCRT_perror(const char* str)
 {
-  _cprintf("%s: %s\n",str,MSVCRT_strerror(msvcrt_get_thread_data()->errno));
+  MSVCRT__cprintf("%s: %s\n",str,MSVCRT_strerror(msvcrt_get_thread_data()->msv_errno));
 }