From 276b938e1dc12985ec736846a1a49bdd5df9a266 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 5 Dec 2008 07:47:01 +0100 Subject: [PATCH] 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 b152eacfbfd..cb005f99cbb 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 ba4e95c7e3d..b53cbcd7b0f 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;