From: pweilbacher Date: Wed, 24 Oct 2007 23:04:32 +0000 (+0000) Subject: Fix os2CurrentTime() to give correct results for negative timezones. (CVS 4513) X-Git-Tag: version-3.6.10~1664 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71be8e692b476083f6e3f4f93e3c5336111ada7d;p=thirdparty%2Fsqlite.git Fix os2CurrentTime() to give correct results for negative timezones. (CVS 4513) FossilOrigin-Name: a3b82548cb51431569aafacf38e3391a8a1b697b --- diff --git a/manifest b/manifest index 54b23e8338..c4d7f747c4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sos2GetTempname()\sto\sactually\swork:\sDosScanEnv()\swants\san\sempty\sPSZ\sas\sargument\sand\swe\sobviously\sdon't\sneed\sto\stest\sfor\sfile\sexistence\sany\smore.\s(CVS\s4512) -D 2007-10-24T23:03:26 +C Fix\sos2CurrentTime()\sto\sgive\scorrect\sresults\sfor\snegative\stimezones.\s(CVS\s4513) +D 2007-10-24T23:04:33 F Makefile.in 30c7e3ba426ddb253b8ef037d1873425da6009a8 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -113,7 +113,7 @@ F src/mutex_w32.c 6e197765f283815496193e78e9548b5d0e53b68e F src/os.c 8360932f1450b2b45edb608a3b184b031f7d00cc F src/os.h b75506ab40d222300f38023acb56fe08df5ffe33 F src/os_common.h 98862f120ca6bf7a48ce8b16f158b77d00bc9d2f -F src/os_os2.c ea8cb86c197abbc94eb55c82f6403644c1eb9963 +F src/os_os2.c 98f5486f033a98406ac10619b2dde21aac9ff75e F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 @@ -584,7 +584,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P e87c883a1235ac47ee340a31051dcd5deb369d4e -R 8e734d5fb9e62d42e48173acdc8210f0 +P 8a233845f61080cca24da3672444f3e5b985da67 +R cfec9c80ac2d201e383258e59bbc24ea U pweilbacher -Z a7a6afdf4d123b7113e6f3532b244c99 +Z da7147504f76c9a8c8ddff06423f9939 diff --git a/manifest.uuid b/manifest.uuid index 49fed89312..73701f16af 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8a233845f61080cca24da3672444f3e5b985da67 \ No newline at end of file +a3b82548cb51431569aafacf38e3391a8a1b697b \ No newline at end of file diff --git a/src/os_os2.c b/src/os_os2.c index 5db4ef09b8..d41f8a2cc0 100644 --- a/src/os_os2.c +++ b/src/os_os2.c @@ -944,12 +944,13 @@ int sqlite3_current_time = 0; */ int os2CurrentTime( sqlite3_vfs *pVfs, double *prNow ){ double now; - USHORT second, minute, hour, + SHORT minute; /* needs to be able to cope with negative timezone offset */ + USHORT second, hour, day, month, year; DATETIME dt; DosGetDateTime( &dt ); second = (USHORT)dt.seconds; - minute = (USHORT)dt.minutes + dt.timezone; + minute = (SHORT)dt.minutes + dt.timezone; hour = (USHORT)dt.hours; day = (USHORT)dt.day; month = (USHORT)dt.month;