database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-09 10:21:35 +03:00
Code Activity

Fix two compilation issues, one warning and one error, that occur only when SQLITE_OMIT_UTF16 is defined.

Browse Source 
FossilOrigin-Name: 10ace06be7fbe9a76a201c418b2af453c7a69043
This commit is contained in:
mistachkin
2013-03-07 06:42:53 +00:00
parent 42c4bd02f4
commit ef593f293e
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\sproblem\sin\sincrvacuum_ioerr.test.\sDo\snot\srun\sioerr6.test\swith\san\sin-memory\sjournal. C Fix\stwo\scompilation\sissues,\sone\swarning\sand\sone\serror,\sthat\soccur\sonly\swhen\sSQLITE_OMIT_UTF16\sis\sdefined.
D 2013-03-06T11:44:57.252 D 2013-03-07T06:42:53.416
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5 F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -133,7 +133,7 @@ F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179 F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
F src/func.c 91bc65eb68ef6cf29198aac92f11489fa85a8de4 F src/func.c f829e79fe7c7150659bee6d521b1edbda4a97dc3
F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -245,7 +245,7 @@ F src/vdbeInt.h 396bb03eec560f768d1b86092b00f46c25575d3b
F src/vdbeapi.c 9616986209cc77822aa9f7d91cf9e6880516d557 F src/vdbeapi.c 9616986209cc77822aa9f7d91cf9e6880516d557
F src/vdbeaux.c 735a6905df302a7f3c715a82bd3af06dc7d74ef2 F src/vdbeaux.c 735a6905df302a7f3c715a82bd3af06dc7d74ef2
F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74 F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9 F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835 F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83 F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
@@ -1037,7 +1037,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 7097241c1220ada318f8eda938c3e3430b94a606 P 66576b450a0f0329571e344280994a964c967f8f
R 4976ca071b3f68a2f418baae58735e49 R 5e4b0b7eaf253c885db9372ffc66a2b3
U dan U mistachkin
Z 03010a9e81700441187a98150a3de05e Z 1464b55cac3d8b1a9f8ec7cbbf4ad03a

2
manifest.uuid
View File

@@ -1 +1 @@
66576b450a0f0329571e344280994a964c967f8f 10ace06be7fbe9a76a201c418b2af453c7a69043

4
src/func.c
View File

@@ -981,6 +981,7 @@ static void unicodeFunc(
** an integer. It constructs a string where each character of the string ** an integer. It constructs a string where each character of the string
** is the unicode character for the corresponding integer argument. ** is the unicode character for the corresponding integer argument.
*/ */
#ifndef SQLITE_OMIT_UTF16
static void charFunc( static void charFunc(
sqlite3_context *context, sqlite3_context *context,
int argc, int argc,
@@ -1012,6 +1013,7 @@ static void charFunc(
} }
sqlite3_result_text16le(context, (char*)z, (int)(zOut-z), sqlite3_free); sqlite3_result_text16le(context, (char*)z, (int)(zOut-z), sqlite3_free);
} }
#endif
/* /*
** The hex() function. Interpret the argument as a blob. Return ** The hex() function. Interpret the argument as a blob. Return
@@ -1641,7 +1643,9 @@ void sqlite3RegisterGlobalFunctions(void){
FUNCTION(substr, 2, 0, 0, substrFunc ), FUNCTION(substr, 2, 0, 0, substrFunc ),
FUNCTION(substr, 3, 0, 0, substrFunc ), FUNCTION(substr, 3, 0, 0, substrFunc ),
FUNCTION(unicode, 1, 0, 0, unicodeFunc ), FUNCTION(unicode, 1, 0, 0, unicodeFunc ),
#ifndef SQLITE_OMIT_UTF16
FUNCTION(char, -1, 0, 0, charFunc ), FUNCTION(char, -1, 0, 0, charFunc ),
#endif
FUNCTION(abs, 1, 0, 0, absFunc ), FUNCTION(abs, 1, 0, 0, absFunc ),
#ifndef SQLITE_OMIT_FLOATING_POINT #ifndef SQLITE_OMIT_FLOATING_POINT
FUNCTION(round, 1, 0, 0, roundFunc ), FUNCTION(round, 1, 0, 0, roundFunc ),

2
src/vdbemem.c
View File

@@ -32,7 +32,9 @@
** between formats. ** between formats.
*/ */
int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){
#ifndef SQLITE_OMIT_UTF16
int rc; int rc;
#endif
assert( (pMem->flags&MEM_RowSet)==0 ); assert( (pMem->flags&MEM_RowSet)==0 );
assert( desiredEnc==SQLITE_UTF8 || desiredEnc==SQLITE_UTF16LE assert( desiredEnc==SQLITE_UTF8 || desiredEnc==SQLITE_UTF16LE
|| desiredEnc==SQLITE_UTF16BE ); || desiredEnc==SQLITE_UTF16BE );