Alexandre Julliard : msvcrt: Don't name a local variable 'errno'.

Alexandre Julliard julliard at winehq.org
Fri Jan 6 15:31:39 CST 2012


Module: wine
Branch: master
Commit: 2a1ce301fa59ba3cc25d8615b8e96a8313b54fc3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a1ce301fa59ba3cc25d8615b8e96a8313b54fc3

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jan  6 21:48:42 2012 +0100

msvcrt: Don't name a local variable 'errno'.

---

 dlls/msvcrt/errno.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index 6094eae..bf65f27 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -130,7 +130,7 @@ static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL;
 /* INTERNAL: Set the crt and dos errno's from the OS error given. */
 void msvcrt_set_errno(int err)
 {
-  int *errno = MSVCRT__errno();
+  int *errno_ptr = MSVCRT__errno();
   MSVCRT_ulong *doserrno = MSVCRT___doserrno();
 
   *doserrno = err;
@@ -138,7 +138,7 @@ void msvcrt_set_errno(int err)
   switch(err)
   {
 #define ERR_CASE(oserr) case oserr:
-#define ERR_MAPS(oserr, crterr) case oserr: *errno = crterr; break
+#define ERR_MAPS(oserr, crterr) case oserr: *errno_ptr = crterr; break
     ERR_CASE(ERROR_ACCESS_DENIED)
     ERR_CASE(ERROR_NETWORK_ACCESS_DENIED)
     ERR_CASE(ERROR_CANNOT_MAKE)
@@ -184,7 +184,7 @@ void msvcrt_set_errno(int err)
   default:
     /*  Remaining cases map to EINVAL */
     /* FIXME: may be missing some errors above */
-    *errno = MSVCRT_EINVAL;
+    *errno_ptr = MSVCRT_EINVAL;
   }
 }
 




More information about the wine-cvs mailing list