diff options
| author | drh <drh@noemail.net> | 2005-12-15 03:04:10 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2005-12-15 03:04:10 +0000 |
| commit | af9a7c22b5b25d557eab2f7e1a66a65fde78005d (patch) | |
| tree | 40a18657a0e4b86442930fdd8497d730675943a9 /src/sqliteInt.h | |
| parent | 26abcb1eef9fb8fe6999e46db55da0bdd98cdeb2 (diff) | |
| download | sqlite-af9a7c22b5b25d557eab2f7e1a66a65fde78005d.tar.gz sqlite-af9a7c22b5b25d557eab2f7e1a66a65fde78005d.zip | |
Fix memory allocation problems on the utf-16 versions of collating function
control routines. (CVS 2817)
FossilOrigin-Name: ad292e27336b8c5afc0acdf111944a456bd23c32
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 2ce46e0ad..aa1bf3e26 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.434 2005/12/12 06:53:05 danielk1977 Exp $ +** @(#) $Id: sqliteInt.h,v 1.435 2005/12/15 03:04:11 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -443,7 +443,6 @@ struct sqlite3 { void(*xCollNeeded)(void*,sqlite3*,int eTextRep,const char*); void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*); void *pCollNeededArg; - sqlite3_value *pValue; /* Value used for transient conversions */ sqlite3_value *pErr; /* Most recent error message */ char *zErrMsg; /* Most recent error message (UTF-8 encoded) */ char *zErrMsg16; /* Most recent error message (UTF-16 encoded) */ @@ -1645,7 +1644,7 @@ int sqlite3ValueBytes(sqlite3_value*, u8); void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8, void(*)(void*)); void sqlite3ValueFree(sqlite3_value*); sqlite3_value *sqlite3ValueNew(void); -sqlite3_value *sqlite3GetTransientValue(sqlite3*db); +char *sqlite3utf16to8(const void*, int); int sqlite3ValueFromExpr(Expr *, u8, u8, sqlite3_value **); void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8); extern const unsigned char sqlite3UpperToLower[]; |