mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unreachable branches from the new JSON aggregate functions.

Browse Source 
FossilOrigin-Name: 6e30f8c6c3af9b0df39783888a1479f88271f989
This commit is contained in:
drh 2016-01-01 00:15:59 +00:00
parent bdfa1b94e9
commit 2307926ea9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/misc/json1.c
View File

@ -1549,7 +1549,7 @@ static void jsonArrayFinal(sqlite3_context *ctx){
jsonAppendChar(pStr, ']'); jsonAppendChar(pStr, ']');
if( pStr->bErr ){ if( pStr->bErr ){
sqlite3_result_error_nomem(ctx); sqlite3_result_error_nomem(ctx);
if( !pStr->bStatic ) sqlite3_free(pStr->zBuf); assert( pStr->bStatic );
}else{ }else{
sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free); pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
@ -1597,7 +1597,7 @@ static void jsonObjectFinal(sqlite3_context *ctx){
jsonAppendChar(pStr, '}'); jsonAppendChar(pStr, '}');
if( pStr->bErr ){ if( pStr->bErr ){
sqlite3_result_error_nomem(ctx); sqlite3_result_error_nomem(ctx);
if( !pStr->bStatic ) sqlite3_free(pStr->zBuf); assert( pStr->bStatic );
}else{ }else{
sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free); pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\sthe\sieee754.test\smodule\sso\sthat\sit\sworks\sboth\son\ssystems\sthat\sreport\ninfinity\sas\s"inf"\sand\sas\s"Inf". C Remove\sunreachable\sbranches\sfrom\sthe\snew\sJSON\saggregate\sfunctions.
D 2015-12-31T22:29:36.133 D 2016-01-01T00:15:59.486
F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751 F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
@ -191,7 +191,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767 F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
F ext/misc/json1.c b7ed42db00f7429c0f0b5068209c95c41b531596 F ext/misc/json1.c 7b1155f520d5e8ec1c005d978ac675e8a7f2688a
F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@ -1406,7 +1406,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
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 8cf01fff232d15d3c7b7b62b2d890d983e1945f2 P d41d4d7396fba60895535f21c438f8c75e7b2097
R 1c5d971ba298f5f3c5fb001aa5fe882d R 2a5f60ea0e38c7e7f43524504946739d
U drh U drh
Z d166bbddc4f1202c8b662a343755f966 Z 26d827cb451c91d1af0425a029635f07

2
manifest.uuid
View File

@ -1 +1 @@
d41d4d7396fba60895535f21c438f8c75e7b2097 6e30f8c6c3af9b0df39783888a1479f88271f989