diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-02-27 19:40:08 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-02-27 19:40:08 +0000 |
| commit | 0404e74caa95a4cde7bdba71ad95d6eb8f924c01 (patch) | |
| tree | c0bcde754c3ce16edbf06bfda8d4f0b058054fb5 /src/printf.c | |
| parent | bfefa4c27b42b74e6b1685a3c93585fd0fa7d666 (diff) | |
| parent | 22ec13466cbc6ce4f3cc642e5c23c5d52dcace27 (diff) | |
| download | sqlite-0404e74caa95a4cde7bdba71ad95d6eb8f924c01.tar.gz sqlite-0404e74caa95a4cde7bdba71ad95d6eb8f924c01.zip | |
Merge updates from trunk.
FossilOrigin-Name: acf7684323da4dc3aaf9746bd13b0f56054a17dd
Diffstat (limited to 'src/printf.c')
| -rw-r--r-- | src/printf.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/printf.c b/src/printf.c index 428c959cc..81efa057f 100644 --- a/src/printf.c +++ b/src/printf.c @@ -212,13 +212,6 @@ void sqlite3VXPrintf( PrintfArguments *pArgList = 0; /* Arguments for SQLITE_PRINTF_SQLFUNC */ char buf[etBUFSIZE]; /* Conversion buffer */ -#ifdef SQLITE_ENABLE_API_ARMOR - if( ap==0 ){ - (void)SQLITE_MISUSE_BKPT; - sqlite3StrAccumReset(pAccum); - return; - } -#endif bufpt = 0; if( bFlags ){ if( (bArgList = (bFlags & SQLITE_PRINTF_SQLFUNC))!=0 ){ @@ -1002,7 +995,7 @@ char *sqlite3_vsnprintf(int n, char *zBuf, const char *zFormat, va_list ap){ #ifdef SQLITE_ENABLE_API_ARMOR if( zBuf==0 || zFormat==0 ) { (void)SQLITE_MISUSE_BKPT; - if( zBuf && n>0 ) zBuf[0] = 0; + if( zBuf ) zBuf[0] = 0; return zBuf; } #endif |