1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00

Implement sqlite3Strlen30() using strlen() from the C library.

FossilOrigin-Name: 8001aa52bd12f900092387fe3571463e89efd977
This commit is contained in:
drh
2015-06-30 03:18:33 +00:00
parent 597d2b6412
commit 1116bf1359
3 changed files with 8 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
C Change\ssqlite3ApiExit()\sso\sthat\sits\sfirst\sargument\sis\snever\sNULL. C Implement\ssqlite3Strlen30()\susing\sstrlen()\sfrom\sthe\sC\slibrary.
D 2015-06-30T03:13:47.365 D 2015-06-30T03:18:33.065
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9 F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -388,7 +388,7 @@ F src/treeview.c c84b1a8ebc7f1d00cd76ce4958eeb3ae1021beed
F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
F src/util.c a6431c92803b975b7322724a7b433e538d243539 F src/util.c a5471ac4834ca3abe9c569745700d3f4dd5f5574
F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701 F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
F src/vdbe.c 5ee4a2bf871418f61d06dc256b9b3a0084b5ec46 F src/vdbe.c 5ee4a2bf871418f61d06dc256b9b3a0084b5ec46
F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473 F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 429ccef2b36fc46e92914eb54afd5f800b1a40ff P 791b706ec6c3e80885666e48e01524f0e9a7557e
R 76fff8f8ba7a3e292fd9a942df7fcd8e R 890e3b877cdeef90793b2b79488c4b65
U drh U drh
Z f5ae2d48a4b628f4b044b90e76fe7af0 Z 7d695210e1c17d010d5e00878a5ee246

View File

@@ -1 +1 @@
791b706ec6c3e80885666e48e01524f0e9a7557e 8001aa52bd12f900092387fe3571463e89efd977

View File

@@ -105,10 +105,8 @@ int sqlite3IsNaN(double x){
** than 1GiB) the value returned might be less than the true string length. ** than 1GiB) the value returned might be less than the true string length.
*/ */
int sqlite3Strlen30(const char *z){ int sqlite3Strlen30(const char *z){
const char *z2 = z;
if( z==0 ) return 0; if( z==0 ) return 0;
while( *z2 ){ z2++; } return 0x3fffffff & (int)strlen(z);
return 0x3fffffff & (int)(z2 - z);
} }
/* /*