diff options
author | Ilia Alshanetsky <iliaa@php.net> | 2005-12-20 15:26:26 +0000 |
---|---|---|
committer | Ilia Alshanetsky <iliaa@php.net> | 2005-12-20 15:26:26 +0000 |
commit | 61c9b22536b74a47211136f73e0d1035fd869999 (patch) | |
tree | 3ec6b1685696f66b9705be06a48bccbac905c48a /ext/sqlite/libsqlite/src/util.c | |
parent | 5961160f95b83d55feba5d6afe56f60106e1b39c (diff) | |
download | php-git-61c9b22536b74a47211136f73e0d1035fd869999.tar.gz |
Updated libsqlite in ext/sqlite to 2.8.17.
Use in-memory database for tests.
Diffstat (limited to 'ext/sqlite/libsqlite/src/util.c')
-rw-r--r-- | ext/sqlite/libsqlite/src/util.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/sqlite/libsqlite/src/util.c b/ext/sqlite/libsqlite/src/util.c index ed399fde21..4fa09b3759 100644 --- a/ext/sqlite/libsqlite/src/util.c +++ b/ext/sqlite/libsqlite/src/util.c @@ -330,15 +330,15 @@ char *sqliteStrNDup(const char *z, int n){ ** point to that string. The 1st argument must either be NULL or ** point to memory obtained from sqliteMalloc(). */ -void sqliteSetString(char **pz, const char *zFirst, ...){ +void sqliteSetString(char **pz, ...){ va_list ap; int nByte; const char *z; char *zResult; if( pz==0 ) return; - nByte = strlen(zFirst) + 1; - va_start(ap, zFirst); + nByte = 1; + va_start(ap, pz); while( (z = va_arg(ap, const char*))!=0 ){ nByte += strlen(z); } @@ -348,9 +348,8 @@ void sqliteSetString(char **pz, const char *zFirst, ...){ if( zResult==0 ){ return; } - strcpy(zResult, zFirst); - zResult += strlen(zResult); - va_start(ap, zFirst); + *zResult = 0; + va_start(ap, pz); while( (z = va_arg(ap, const char*))!=0 ){ strcpy(zResult, z); zResult += strlen(zResult); |