diff options
| author | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
| commit | 1bb15fc973f5b1b472897095f629abcc663bd453 (patch) | |
| tree | 4eda31846a69354eb5ba5ff9dc91602a18d942ac /src/util.c | |
| parent | 769dc6e2a22b3104583ad357b01f31a22e146a5c (diff) | |
| parent | f7ce4291a94573cdb04e5f3fcf59ed9e69226479 (diff) | |
| download | sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.tar.gz sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.zip | |
Merge recent enhancements from trunk.
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index f218bb794..b4c5e62bb 100644 --- a/src/util.c +++ b/src/util.c @@ -555,7 +555,8 @@ int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc){ testcase( i==18 ); testcase( i==19 ); testcase( i==20 ); - if( (c!=0 && &zNum[i]<zEnd) || (i==0 && zStart==zNum) || i>19*incr || nonNum ){ + if( (c!=0 && &zNum[i]<zEnd) || (i==0 && zStart==zNum) + || i>19*incr || nonNum ){ /* zNum is empty or contains non-numeric text or is longer ** than 19 digits (thus guaranteeing that it is too large) */ return 1; @@ -844,7 +845,8 @@ u8 sqlite3GetVarint(const unsigned char *p, u64 *v){ /* a: p0<<28 | p2<<14 | p4 (unmasked) */ if (!(a&0x80)) { - /* we can skip these cause they were (effectively) done above in calc'ing s */ + /* we can skip these cause they were (effectively) done above + ** while calculating s */ /* a &= (0x7f<<28)|(0x7f<<14)|(0x7f); */ /* b &= (0x7f<<14)|(0x7f); */ b = b<<7; |