Change the error message returned when localtime_r() fails to "local time unavailable".

FossilOrigin-Name: 0e82175fd86f0ca5da90676aaee3118a70264d85

diff --git a/manifest b/manifest
index e8a4ded64c52fab84caee37e2219fca2601f0a03..3b86500f0fb91f79c472e97abfe05726c1a810f5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\serror\smade\sin\sthe\sprevious\scommit.\sThe\sparameters\sto\slocaltime_s()\swere\saccidentally\sreversed.
-D 2011-06-21T12:53:14.904
+C Change\sthe\serror\smessage\sreturned\swhen\slocaltime_r()\sfails\sto\s"local\stime\sunavailable".
+D 2011-06-21T13:46:11.287
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -131,7 +131,7 @@ F src/build.c 5a428625d21ad409514afb40ad083bee25dd957a
 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
-F src/date.c f3711b130f0a95d9b92733dbdaecdacc4ba71f35
+F src/date.c 193172e7a5e46b710bbf0f4211583ff6c23c7e21
 F src/delete.c cecc926c70783452f3e8eb452c728291ce1a0b21
 F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
@@ -729,7 +729,7 @@ F test/tkt-94c04eaadb.test be5ea61cb04dfdc047d19b5c5a9e75fa3da67a7f
 F test/tkt-9d68c883.test 458f7d82a523d7644b54b497c986378a7d8c8b67
 F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0
 F test/tkt-b72787b1.test e6b62b2b2785c04d0d698d6a603507e384165049
-F test/tkt-bd484a090c.test 6db2d385ad47004e091bdda0d7da083365bb10ec
+F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898
 F test/tkt-cbd054fa6b.test f14f97ea43662e6f70c9e63287081e8be5d9d589
 F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
 F test/tkt-d82e3f3721.test 731359dfdcdb36fea0559cd33fec39dd0ceae8e6
@@ -948,7 +948,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 76ae8257efc1df6e20ce5718d4824adbbde423ec
-R 9f3386b83f2229ba9b1f406ebc50b4c5
+P 97e86ec6df4d893527fe9f43eb46163d9b06416a
+R e0015d917e226c6056689f5a9862debe
 U dan
-Z 7625d40f524bfcbd49390918c2896fb2
+Z 66bfa4b384ab8dfebefd27a1fbb7cf7e

diff --git a/manifest.uuid b/manifest.uuid
index a80623a83c2bbd3ab444c0c47d20029e3ef7d26e..d35b4bff4d5f1507ba246fbcbd57252a75bbfeb0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-97e86ec6df4d893527fe9f43eb46163d9b06416a
\ No newline at end of file
+0e82175fd86f0ca5da90676aaee3118a70264d85
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index 0bb73560d144442d54ad835d701672b2f8f5f2c2..1cf51183e91f3a4313b90e67ea167d25ff2cb6b4 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -483,7 +483,7 @@ static sqlite3_int64 localtimeOffset(
   {
     struct tm sLocal;
     if( 0==osLocaltime_r(&t, &sLocal) ){
-      sqlite3_result_error(pCtx, "error in localtime_r()", -1);
+      sqlite3_result_error(pCtx, "local time unavailable", -1);
       *pRc = SQLITE_ERROR;
       return 0;
     }
@@ -498,7 +498,7 @@ static sqlite3_int64 localtimeOffset(
   {
     struct tm sLocal;
     if( 0!=osLocaltime_s(&sLocal, &t) ){
-      sqlite3_result_error(pCtx, "error in localtime_s()", -1);
+      sqlite3_result_error(pCtx, "local time unavailable", -1);
       *pRc = SQLITE_ERROR;
       return 0;
     }
@@ -524,7 +524,7 @@ static sqlite3_int64 localtimeOffset(
     }
     sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
     if( !pTm ){
-      sqlite3_result_error(pCtx, "error in localtime()", -1);
+      sqlite3_result_error(pCtx, "local time unavailable", -1);
       *pRc = SQLITE_ERROR;
       return 0;
     }

diff --git a/test/tkt-bd484a090c.test b/test/tkt-bd484a090c.test
index f917a6946f1572d6d2c69bcc2f991887a3e71cdb..3d2b59995857c9a7f61b6860c381c51b23cdf036 100644 (file)
--- a/test/tkt-bd484a090c.test
+++ b/test/tkt-bd484a090c.test
@@ -27,15 +27,11 @@ do_test 1.2 {
 sqlite3_test_control SQLITE_TESTCTRL_LOCALTIME_FAULT 1
 
 do_test 2.1 {
-  foreach {rc msg} [catchsql { SELECT datetime('now', 'localtime') }] {}
-  set res [string match {error in localtime*()} $msg]
-  list $rc $res
-} {1 1}
+  catchsql { SELECT datetime('now', 'localtime') }
+} {1 {local time unavailable}}
 do_test 2.2 {
-  foreach {rc msg} [catchsql { SELECT datetime('now', 'utc') }] {}
-  set res [string match {error in localtime*()} $msg]
-  list $rc $res
-} {1 1}
+  catchsql { SELECT datetime('now', 'utc') }
+} {1 {local time unavailable}}
 
 sqlite3_test_control SQLITE_TESTCTRL_LOCALTIME_FAULT 0