Michael Stefaniuc : msvcrt: Use NULL instead of casting zero.

Alexandre Julliard julliard at winehq.org
Fri Dec 5 07:42:55 CST 2008


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Dec  5 07:47:01 2008 +0100

msvcrt: Use NULL instead of casting zero.

---

 dlls/msvcrt/tests/scanf.c |    2 +-
 dlls/msvcrt/time.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c
index b152eac..cb005f9 100644
--- a/dlls/msvcrt/tests/scanf.c
+++ b/dlls/msvcrt/tests/scanf.c
@@ -51,7 +51,7 @@ static void test_sscanf( void )
     ok( ptr == (void *)0x46F172,"sscanf reads %p instead of %x\n", ptr, 0x46F172 );
 
     ok( sscanf("0x46F173", "%p", &ptr) == 1, "sscanf failed\n"  );
-    ok( ptr == (void *)0,"sscanf reads %p instead of %x\n", ptr, 0 );
+    ok( ptr == NULL,"sscanf reads %p instead of %x\n", ptr, 0 );
 
     ok( sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n"  );
     ok( ptr == (void *)0xFFB90E8C,"sscanf reads %p instead of %x\n", ptr, 0xFFB90E8C );
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index ba4e95c..b53cbcd 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -340,7 +340,7 @@ void CDECL MSVCRT__tzset(void)
         struct tm *tmp;
         long zone_january, zone_july;
 
-        t = (time((time_t *)0) / seconds_in_year) * seconds_in_year;
+        t = (time(NULL) / seconds_in_year) * seconds_in_year;
         tmp = localtime(&t);
         zone_january = -tmp->tm_gmtoff;
         t += seconds_in_year / 2;




More information about the wine-cvs mailing list