1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

The SQLITE_OMIT_UTF16 macro now removes lots of code and all tests still pass. (CVS 2100)

FossilOrigin-Name: 98c7a55478f7c465b219edc1a33eee222586fd65
This commit is contained in:
drh
2004-11-14 21:56:29 +00:00
parent 5436dc2d97
commit 6c62608fc6
20 changed files with 172 additions and 112 deletions

View File

@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
** $Id: main.c,v 1.264 2004/11/11 05:10:44 danielk1977 Exp $
** $Id: main.c,v 1.265 2004/11/14 21:56:30 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -880,6 +880,7 @@ const char *sqlite3_errmsg(sqlite3 *db){
return z;
}
#ifndef SQLITE_OMIT_UTF16
/*
** Return UTF-16 encoded English language explanation of the most recent
** error.
@@ -919,6 +920,7 @@ const void *sqlite3_errmsg16(sqlite3 *db){
}
return z;
}
#endif /* SQLITE_OMIT_UTF16 */
/*
** Return the most recent error code generated by an SQLite routine.
@@ -1033,6 +1035,7 @@ prepare_out:
return rc;
}
#ifndef SQLITE_OMIT_UTF16
/*
** Compile the UTF-16 encoded SQL statement zSql into a statement handle.
*/
@@ -1076,6 +1079,7 @@ int sqlite3_prepare16(
return rc;
}
#endif /* SQLITE_OMIT_UTF16 */
/*
** This routine does the work of opening a database on behalf of
@@ -1177,6 +1181,7 @@ int sqlite3_open(
return openDatabase(zFilename, ppDb);
}
#ifndef SQLITE_OMIT_UTF16
/*
** Open a new database handle.
*/
@@ -1205,6 +1210,7 @@ int sqlite3_open16(
return rc;
}
#endif /* SQLITE_OMIT_UTF16 */
/*
** The following routine destroys a virtual machine that is created by
@@ -1288,6 +1294,7 @@ int sqlite3_create_collation(
return rc;
}
#ifndef SQLITE_OMIT_UTF16
/*
** Register a new collation sequence with the database handle db.
*/
@@ -1308,6 +1315,7 @@ int sqlite3_create_collation16(
zName8 = sqlite3ValueText(pTmp, SQLITE_UTF8);
return sqlite3_create_collation(db, zName8, enc, pCtx, xCompare);
}
#endif /* SQLITE_OMIT_UTF16 */
/*
** Register a collation sequence factory callback with the database handle
@@ -1327,6 +1335,7 @@ int sqlite3_collation_needed(
return SQLITE_OK;
}
#ifndef SQLITE_OMIT_UTF16
/*
** Register a collation sequence factory callback with the database handle
** db. Replace any previously installed collation sequence factory.
@@ -1344,3 +1353,4 @@ int sqlite3_collation_needed16(
db->pCollNeededArg = pCollNeededArg;
return SQLITE_OK;
}
#endif /* SQLITE_OMIT_UTF16 */