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

Remove a NEVER() that can sometimes occur on an OOM error. (CVS 6744)

Browse Source 
FossilOrigin-Name: c27f23bbafd2e4fa453c8e3b83667ea8173183a7
This commit is contained in:
drh
2009-06-10 11:07:00 +00:00
parent e56b60ecb8
commit 85119c32ad
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Minor\stweak\sto\sbalance_quick()\sto\ssave\sa\sfew\sinstructions.\s(CVS\s6743) C Remove\sa\sNEVER()\sthat\scan\ssometimes\soccur\son\san\sOOM\serror.\s(CVS\s6744)
D 2009-06-10T09:11:06 D 2009-06-10T11:07:01
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 8b8fb7823264331210cddf103831816c286ba446 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -201,7 +201,7 @@ F src/tokenize.c d8c6b39a6056db2b47a212607689dd7ee8031c69
F src/trigger.c c07c5157c58fcdb704f65d5f5e4775276e45bb8b F src/trigger.c c07c5157c58fcdb704f65d5f5e4775276e45bb8b
F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177 F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177
F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
F src/util.c 8ff385a6b474e840d4fa3621f5f7263028ac892c F src/util.c 44e9f8b4c1a37cbc739e8c5c4d1eae8308a37da5
F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59 F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59
F src/vdbe.c 20cf0b0b388685b759077db32002eb0dd3770436 F src/vdbe.c 20cf0b0b388685b759077db32002eb0dd3770436
F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
P e9b55ccc8b6d4f21c9c8f8e7ba053475833fc833 P 9ace995910c8b0b9e95dc20fd70be487199e37af
R b6154da6dd88f79ffa10cad6e611f694 R 2cecd4983d351cd4a46724b94b6d66c5
U danielk1977 U drh
Z daa8926ed5a868ea8b7803008aa6961f Z ab21f098e14a1ba35a0f308bb93f9a53

2
manifest.uuid
View File

@@ -1 +1 @@
9ace995910c8b0b9e95dc20fd70be487199e37af c27f23bbafd2e4fa453c8e3b83667ea8173183a7

4
src/util.c
View File

@@ -14,7 +14,7 @@
** This file contains functions for allocating memory, comparing ** This file contains functions for allocating memory, comparing
** strings, and stuff like that. ** strings, and stuff like that.
** **
** $Id: util.c,v 1.258 2009/06/05 14:17:23 drh Exp $ ** $Id: util.c,v 1.259 2009/06/10 11:07:01 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <stdarg.h> #include <stdarg.h>
@@ -108,7 +108,7 @@ int sqlite3IsNaN(double x){
*/ */
int sqlite3Strlen30(const char *z){ int sqlite3Strlen30(const char *z){
const char *z2 = z; const char *z2 = z;
if( NEVER(z==0) ) return 0; if( z==0 ) return 0;
while( *z2 ){ z2++; } while( *z2 ){ z2++; }
return 0x3fffffff & (int)(z2 - z); return 0x3fffffff & (int)(z2 - z);
} }