From: dan <dan@noemail.net>
Date: Tue, 5 Jan 2010 18:11:52 +0000 (+0000)
Subject: Apply fix [9b8acf8319] to the 3.6.1 branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f4c8900057252de6eebff3da57d01b2eebe8ea4;p=thirdparty%2Fsqlite.git

Apply fix [9b8acf8319] to the 3.6.1 branch.

FossilOrigin-Name: 62b4891b155ae566006236fee368794eabcd71a3
---

diff --git a/manifest b/manifest
index c35c9f68a3..e24e168adf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Apply\sfix\s[097737e368]\sto\sthe\s3.6.1\sbranch.
-D 2010-01-05T18:06:38
+C Apply\sfix\s[9b8acf8319]\sto\sthe\s3.6.1\sbranch.
+D 2010-01-05T18:11:53
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -115,7 +115,7 @@ F src/insert.c 89cd9af52a5ea6fb7d0cfc9c3b935d6406c360c4
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c aac57bd984e666059011ea01ec4383892a253be3
 F src/loadext.c eb1fe4f44d7c8ff53fc0c6a4388ab79fbd34cd64
-F src/main.c d750c6c0d381252851401f6ea2ee72185de005ed
+F src/main.c bafdff2621497d602a5010a8700297d5fd8a9792
 F src/malloc.c 22c68fc62f0c2df0f1deb8cd9a5ea968f995cac2
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 3a7fe31d8290baa3bb203af72f7dfd6323966bcd
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 65ab777fd0a29ca99a240411b94ac83041f90c98
-R 0688a9cc7d3074a421e3eb24b4a52eea
+P 9f819ea6b21e13e6def5c841cbdba96661f322a3
+R 3d0a074f76cf6d4fa9806148f6ad144b
 U dan
-Z 68f2f61dc743d15d18454969a70157e8
+Z e82845b46439863070353ea34d902bb9
diff --git a/manifest.uuid b/manifest.uuid
index f14f02e02d..8de9441862 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f819ea6b21e13e6def5c841cbdba96661f322a3
\ No newline at end of file
+62b4891b155ae566006236fee368794eabcd71a3
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 68500eb1a9..eeabe25fce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1131,31 +1131,24 @@ const char *sqlite3_errmsg(sqlite3 *db){
 ** error.
 */
 const void *sqlite3_errmsg16(sqlite3 *db){
-  /* Because all the characters in the string are in the unicode
-  ** range 0x00-0xFF, if we pad the big-endian string with a 
-  ** zero byte, we can obtain the little-endian string with
-  ** &big_endian[1].
-  */
-  static const char outOfMemBe[] = {
-    0, 'o', 0, 'u', 0, 't', 0, ' ', 
-    0, 'o', 0, 'f', 0, ' ', 
-    0, 'm', 0, 'e', 0, 'm', 0, 'o', 0, 'r', 0, 'y', 0, 0, 0
+  static const u16 outOfMem[] = {
+    'o', 'u', 't', ' ', 'o', 'f', ' ', 'm', 'e', 'm', 'o', 'r', 'y', 0
   };
-  static const char misuseBe [] = {
-    0, 'l', 0, 'i', 0, 'b', 0, 'r', 0, 'a', 0, 'r', 0, 'y', 0, ' ', 
-    0, 'r', 0, 'o', 0, 'u', 0, 't', 0, 'i', 0, 'n', 0, 'e', 0, ' ', 
-    0, 'c', 0, 'a', 0, 'l', 0, 'l', 0, 'e', 0, 'd', 0, ' ', 
-    0, 'o', 0, 'u', 0, 't', 0, ' ', 
-    0, 'o', 0, 'f', 0, ' ', 
-    0, 's', 0, 'e', 0, 'q', 0, 'u', 0, 'e', 0, 'n', 0, 'c', 0, 'e', 0, 0, 0
+  static const u16 misuse[] = {
+    'l', 'i', 'b', 'r', 'a', 'r', 'y', ' ',
+    'r', 'o', 'u', 't', 'i', 'n', 'e', ' ',
+    'c', 'a', 'l', 'l', 'e', 'd', ' ',
+    'o', 'u', 't', ' ',
+    'o', 'f', ' ',
+    's', 'e', 'q', 'u', 'e', 'n', 'c', 'e', 0
   };
 
   const void *z;
   if( !db ){
-    return (void *)(&outOfMemBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]);
+    return (void *)outOfMem;
   }
   if( !sqlite3SafetyCheckSickOrOk(db) ){
-    return (void *)(&misuseBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]);
+    return (void *)misuse;
   }
   sqlite3_mutex_enter(db->mutex);
   assert( !db->mallocFailed );