aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/build.c5
-rw-r--r--src/date.c6
-rw-r--r--src/func.c54
-rw-r--r--src/main.c18
-rw-r--r--src/sqlite.h.in12
-rw-r--r--src/sqliteInt.h8
-rw-r--r--src/tclsqlite.c6
-rw-r--r--src/test1.c16
-rw-r--r--src/test5.c9
-rw-r--r--src/tokenize.c5
-rw-r--r--src/utf.c8
-rw-r--r--src/vdbe.c12
-rw-r--r--src/vdbeInt.h4
-rw-r--r--src/vdbeapi.c2
-rw-r--r--src/vdbeaux.c10
-rw-r--r--src/vdbemem.c16
16 files changed, 95 insertions, 96 deletions
diff --git a/src/build.c b/src/build.c
index 74e0a8a90..48cc1f596 100644
--- a/src/build.c
+++ b/src/build.c
@@ -23,7 +23,7 @@
** ROLLBACK
** PRAGMA
**
-** $Id: build.c,v 1.204 2004/05/31 11:51:45 danielk1977 Exp $
+** $Id: build.c,v 1.205 2004/05/31 18:51:58 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -886,6 +886,9 @@ char sqlite3AffinityType(const char *zType, int nType){
{"BLOB", 4, SQLITE_AFF_NONE},
};
+ if( nType==0 ){
+ return SQLITE_AFF_NONE;
+ }
for(i=0; i<sizeof(substrings)/sizeof(substrings[0]); i++){
int c1 = substrings[i].zSub[0];
int c2 = tolower(c1);
diff --git a/src/date.c b/src/date.c
index 42f42f22d..e304d70aa 100644
--- a/src/date.c
+++ b/src/date.c
@@ -16,7 +16,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: date.c,v 1.26 2004/05/26 23:25:31 drh Exp $
+** $Id: date.c,v 1.27 2004/05/31 18:51:58 drh Exp $
**
** NOTES:
**
@@ -644,10 +644,10 @@ static int parseModifier(const char *zMod, DateTime *p){
static int isDate(int argc, sqlite3_value **argv, DateTime *p){
int i;
if( argc==0 ) return 1;
- if( SQLITE3_NULL==sqlite3_value_type(argv[0]) ||
+ if( SQLITE_NULL==sqlite3_value_type(argv[0]) ||
parseDateOrTime(sqlite3_value_text(argv[0]), p) ) return 1;
for(i=1; i<argc; i++){
- if( SQLITE3_NULL==sqlite3_value_type(argv[i]) ||
+ if( SQLITE_NULL==sqlite3_value_type(argv[i]) ||
parseModifier(sqlite3_value_text(argv[i]), p) ) return 1;
}
return 0;
diff --git a/src/func.c b/src/func.c
index c1b986382..706bfcf75 100644
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: func.c,v 1.61 2004/05/27 10:30:53 danielk1977 Exp $
+** $Id: func.c,v 1.62 2004/05/31 18:51:58 drh Exp $
*/
#include <ctype.h>
#include <math.h>
@@ -42,9 +42,9 @@ static void minmaxFunc(
mask = (int)sqlite3_user_data(context);
assert( mask==-1 || mask==0 );
iBest = 0;
- if( sqlite3_value_type(argv[0])==SQLITE3_NULL ) return;
+ if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
for(i=1; i<argc; i++){
- if( sqlite3_value_type(argv[i])==SQLITE3_NULL ) return;
+ if( sqlite3_value_type(argv[i])==SQLITE_NULL ) return;
if( (sqlite3MemCompare(argv[iBest], argv[i], 0)^mask)>=0 ){
iBest = i;
}
@@ -62,11 +62,11 @@ static void typeofFunc(
){
const char *z = 0;
switch( sqlite3_value_type(argv[0]) ){
- case SQLITE3_NULL: z = "null"; break;
- case SQLITE3_INTEGER: z = "integer"; break;
- case SQLITE3_TEXT: z = "text"; break;
- case SQLITE3_FLOAT: z = "real"; break;
- case SQLITE3_BLOB: z = "blob"; break;
+ case SQLITE_NULL: z = "null"; break;
+ case SQLITE_INTEGER: z = "integer"; break;
+ case SQLITE_TEXT: z = "text"; break;
+ case SQLITE_FLOAT: z = "real"; break;
+ case SQLITE_BLOB: z = "blob"; break;
}
sqlite3_result_text(context, z, -1, 0);
}
@@ -83,13 +83,13 @@ static void lengthFunc(
assert( argc==1 );
switch( sqlite3_value_type(argv[0]) ){
- case SQLITE3_BLOB:
- case SQLITE3_INTEGER:
- case SQLITE3_FLOAT: {
+ case SQLITE_BLOB:
+ case SQLITE_INTEGER:
+ case SQLITE_FLOAT: {
sqlite3_result_int(context, sqlite3_value_bytes(argv[0]));
break;
}
- case SQLITE3_TEXT: {
+ case SQLITE_TEXT: {
const char *z = sqlite3_value_text(argv[0]);
for(len=0; *z; z++){ if( (0xc0&*z)!=0x80 ) len++; }
sqlite3_result_int(context, len);
@@ -108,13 +108,13 @@ static void lengthFunc(
static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
assert( argc==1 );
switch( sqlite3_value_type(argv[0]) ){
- case SQLITE3_INTEGER: {
+ case SQLITE_INTEGER: {
i64 iVal = sqlite3_value_int64(argv[0]);
if( iVal<0 ) iVal = iVal * -1;
sqlite3_result_int64(context, iVal);
break;
}
- case SQLITE3_NULL: {
+ case SQLITE_NULL: {
sqlite3_result_null(context);
break;
}
@@ -179,12 +179,12 @@ static void roundFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
char zBuf[100];
assert( argc==1 || argc==2 );
if( argc==2 ){
- if( SQLITE3_NULL==sqlite3_value_type(argv[1]) ) return;
+ if( SQLITE_NULL==sqlite3_value_type(argv[1]) ) return;
n = sqlite3_value_int(argv[1]);
if( n>30 ) n = 30;
if( n<0 ) n = 0;
}
- if( SQLITE3_NULL==sqlite3_value_type(argv[0]) ) return;
+ if( SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
r = sqlite3_value_double(argv[0]);
sprintf(zBuf,"%.*f",n,r);
sqlite3_result_text(context, zBuf, -1, 1);
@@ -196,7 +196,7 @@ static void roundFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
char *z;
int i;
- if( argc<1 || SQLITE3_NULL==sqlite3_value_type(argv[0]) ) return;
+ if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
z = sqliteMalloc(sqlite3_value_bytes(argv[0])+1);
if( z==0 ) return;
strcpy(z, sqlite3_value_text(argv[0]));
@@ -209,7 +209,7 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
char *z;
int i;
- if( argc<1 || SQLITE3_NULL==sqlite3_value_type(argv[0]) ) return;
+ if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
z = sqliteMalloc(sqlite3_value_bytes(argv[0])+1);
if( z==0 ) return;
strcpy(z, sqlite3_value_text(argv[0]));
@@ -232,7 +232,7 @@ static void ifnullFunc(
){
int i;
for(i=0; i<argc; i++){
- if( SQLITE3_NULL!=sqlite3_value_type(argv[i]) ){
+ if( SQLITE_NULL!=sqlite3_value_type(argv[i]) ){
sqlite3_result_value(context, argv[i]);
break;
}
@@ -371,17 +371,17 @@ static void versionFunc(
static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
if( argc<1 ) return;
switch( sqlite3_value_type(argv[0]) ){
- case SQLITE3_NULL: {
+ case SQLITE_NULL: {
sqlite3_result_text(context, "NULL", 4, 0);
break;
}
- case SQLITE3_INTEGER:
- case SQLITE3_FLOAT: {
+ case SQLITE_INTEGER:
+ case SQLITE_FLOAT: {
sqlite3_result_value(context, argv[0]);
break;
}
- case SQLITE3_BLOB: /*** FIX ME. Use a BLOB encoding ***/
- case SQLITE3_TEXT: {
+ case SQLITE_BLOB: /*** FIX ME. Use a BLOB encoding ***/
+ case SQLITE_TEXT: {
int i,j,n;
const char *zArg = sqlite3_value_text(argv[0]);
char *z;
@@ -504,7 +504,7 @@ static void sumStep(sqlite3_context *context, int argc, sqlite3_value **argv){
SumCtx *p;
if( argc<1 ) return;
p = sqlite3_aggregate_context(context, sizeof(*p));
- if( p && SQLITE3_NULL!=sqlite3_value_type(argv[0]) ){
+ if( p && SQLITE_NULL!=sqlite3_value_type(argv[0]) ){
p->sum += sqlite3_value_double(argv[0]);
p->cnt++;
}
@@ -575,7 +575,7 @@ struct CountCtx {
static void countStep(sqlite3_context *context, int argc, sqlite3_value **argv){
CountCtx *p;
p = sqlite3_aggregate_context(context, sizeof(*p));
- if( (argc==0 || SQLITE3_NULL!=sqlite3_value_type(argv[0])) && p ){
+ if( (argc==0 || SQLITE_NULL!=sqlite3_value_type(argv[0])) && p ){
p->n++;
}
}
@@ -604,7 +604,7 @@ static void minmaxStep(sqlite3_context *context, int argc, sqlite3_value **argv)
Mem *pArg = (Mem *)argv[0];
Mem *pBest = (Mem *)sqlite3_aggregate_context(context, sizeof(*pBest));
- if( SQLITE3_NULL==sqlite3_value_type(argv[0]) ) return;
+ if( SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
if( pBest->flags ){
/* This step function is used for both the min() and max() aggregates,
diff --git a/src/main.c b/src/main.c
index 990920606..02a439141 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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.198 2004/05/31 08:55:34 danielk1977 Exp $
+** $Id: main.c,v 1.199 2004/05/31 18:51:58 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -30,8 +30,8 @@ typedef struct {
} InitData;
/*
-** The following constant value is used by the SQLITE3_BIGENDIAN and
-** SQLITE3_LITTLEENDIAN macros.
+** The following constant value is used by the SQLITE_BIGENDIAN and
+** SQLITE_LITTLEENDIAN macros.
*/
const int sqlite3one = 1;
@@ -692,7 +692,7 @@ int sqlite3_create_function16(
){
int rc;
char *zFunctionName8;
- zFunctionName8 = sqlite3utf16to8(zFunctionName, -1, SQLITE3_BIGENDIAN);
+ zFunctionName8 = sqlite3utf16to8(zFunctionName, -1, SQLITE_BIGENDIAN);
if( !zFunctionName8 ){
return SQLITE_NOMEM;
}
@@ -819,7 +819,7 @@ const void *sqlite3_errmsg16(sqlite3 *db){
};
static char *outOfMemLe = &outOfMemBe[1];
- if( SQLITE3_BIGENDIAN ){
+ if( SQLITE_BIGENDIAN ){
return (void *)outOfMemBe;
}else{
return (void *)outOfMemLe;
@@ -827,7 +827,7 @@ const void *sqlite3_errmsg16(sqlite3 *db){
}
if( !db->zErrMsg16 ){
char const *zErr8 = sqlite3_errmsg(db);
- if( SQLITE3_BIGENDIAN ){
+ if( SQLITE_BIGENDIAN ){
db->zErrMsg16 = sqlite3utf8to16be(zErr8, -1);
}else{
db->zErrMsg16 = sqlite3utf8to16le(zErr8, -1);
@@ -960,7 +960,7 @@ int sqlite3_prepare16(
char const *zTail8 = 0;
int rc;
- zSql8 = sqlite3utf16to8(zSql, nBytes, SQLITE3_BIGENDIAN);
+ zSql8 = sqlite3utf16to8(zSql, nBytes, SQLITE_BIGENDIAN);
if( !zSql8 ){
sqlite3Error(db, SQLITE_NOMEM, 0);
return SQLITE_NOMEM;
@@ -1090,7 +1090,7 @@ int sqlite3_open16(
assert( ppDb );
- zFilename8 = sqlite3utf16to8(zFilename, -1, SQLITE3_BIGENDIAN);
+ zFilename8 = sqlite3utf16to8(zFilename, -1, SQLITE_BIGENDIAN);
if( !zFilename8 ){
*ppDb = 0;
return SQLITE_NOMEM;
@@ -1098,7 +1098,7 @@ int sqlite3_open16(
/* FIX ME: Also need to translate the option strings */
- if( SQLITE3_BIGENDIAN ){
+ if( SQLITE_BIGENDIAN ){
rc = openDatabase(zFilename8, ppDb, options, TEXT_Utf16be);
}else{
rc = openDatabase(zFilename8, ppDb, options, TEXT_Utf16le);
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 1131e4cfb..9edb00456 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
** This header file defines the interface that the SQLite library
** presents to client programs.
**
-** @(#) $Id: sqlite.h.in,v 1.85 2004/05/27 23:56:16 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.86 2004/05/31 18:51:58 drh Exp $
*/
#ifndef _SQLITE_H_
#define _SQLITE_H_
@@ -768,11 +768,11 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** Values are stored in the database in one of the following fundamental
** types.
*/
-#define SQLITE3_INTEGER 1
-#define SQLITE3_FLOAT 2
-#define SQLITE3_TEXT 3
-#define SQLITE3_BLOB 4
-#define SQLITE3_NULL 5
+#define SQLITE_INTEGER 1
+#define SQLITE_FLOAT 2
+#define SQLITE_TEXT 3
+#define SQLITE_BLOB 4
+#define SQLITE_NULL 5
/*
** The next group of routines returns information about the information
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index c0ef83e15..da78ae828 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.264 2004/05/31 18:23:09 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.265 2004/05/31 18:51:58 drh Exp $
*/
#include "config.h"
#include "sqlite3.h"
@@ -134,8 +134,8 @@ typedef unsigned INTPTR_TYPE uptr; /* Big enough to hold a pointer */
** evaluated at runtime.
*/
extern const int sqlite3one;
-#define SQLITE3_BIGENDIAN (*(char *)(&sqlite3one)==0)
-#define SQLITE3_LITTLEENDIAN (*(char *)(&sqlite3one)==1)
+#define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0)
+#define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1)
/*
** Defer sourcing vdbe.h until after the "u8" typedef is defined.
@@ -324,7 +324,7 @@ struct Db {
#define TEXT_Utf8 1
#define TEXT_Utf16le 2
#define TEXT_Utf16be 3
-#define TEXT_Utf16 (SQLITE3_BIGENDIAN?TEXT_Utf16be:TEXT_Utf16le)
+#define TEXT_Utf16 (SQLITE_BIGENDIAN?TEXT_Utf16be:TEXT_Utf16le)
/*
** Each database is an instance of the following structure.
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index c446710a7..cfdb4da66 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
*************************************************************************
** A TCL Interface to SQLite
**
-** $Id: tclsqlite.c,v 1.76 2004/05/29 02:37:19 danielk1977 Exp $
+** $Id: tclsqlite.c,v 1.77 2004/05/31 18:51:58 drh Exp $
*/
#ifndef NO_TCL /* Omit this whole file if TCL is unavailable */
@@ -213,7 +213,7 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value **argv)
Tcl_DStringInit(&cmd);
Tcl_DStringAppend(&cmd, p->zScript, -1);
for(i=0; i<argc; i++){
- if( SQLITE3_NULL==sqlite3_value_type(argv[i]) ){
+ if( SQLITE_NULL==sqlite3_value_type(argv[i]) ){
Tcl_DStringAppendElement(&cmd, "");
}else{
Tcl_DStringAppendElement(&cmd, sqlite3_value_text(argv[i]));
@@ -658,7 +658,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
Tcl_Obj *pVal;
/* Set pVal to contain the i'th column of this row. */
- if( SQLITE3_BLOB!=sqlite3_column_type(pStmt, i) ){
+ if( SQLITE_BLOB!=sqlite3_column_type(pStmt, i) ){
pVal = dbTextToObj(sqlite3_column_text(pStmt, i));
}else{
int bytes = sqlite3_column_bytes(pStmt, i);
diff --git a/src/test1.c b/src/test1.c
index bf33d8bb6..e5cfde5b7 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
** is not included in the SQLite library. It is used for automated
** testing of the SQLite library.
**
-** $Id: test1.c,v 1.65 2004/05/27 14:23:36 danielk1977 Exp $
+** $Id: test1.c,v 1.66 2004/05/31 18:51:58 drh Exp $
*/
#include "sqliteInt.h"
#include "tcl.h"
@@ -325,7 +325,7 @@ static int sqlite_test_close(
static void ifnullFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
int i;
for(i=0; i<argc; i++){
- if( SQLITE3_NULL!=sqlite3_value_type(argv[i]) ){
+ if( SQLITE_NULL!=sqlite3_value_type(argv[i]) ){
sqlite3_result_text(context, sqlite3_value_text(argv[i]), -1, 1);
break;
}
@@ -450,7 +450,7 @@ struct CountCtx {
static void countStep(sqlite3_context *context, int argc, sqlite3_value **argv){
CountCtx *p;
p = sqlite3_aggregate_context(context, sizeof(*p));
- if( (argc==0 || SQLITE3_NULL!=sqlite3_value_type(argv[0]) ) && p ){
+ if( (argc==0 || SQLITE_NULL!=sqlite3_value_type(argv[0]) ) && p ){
p->n++;
}
}
@@ -1399,19 +1399,19 @@ static int test_column_type(
tp = sqlite3_column_type(pStmt, col);
switch( tp ){
- case SQLITE3_INTEGER:
+ case SQLITE_INTEGER:
Tcl_SetResult(interp, "INTEGER", TCL_STATIC);
break;
- case SQLITE3_NULL:
+ case SQLITE_NULL:
Tcl_SetResult(interp, "NULL", TCL_STATIC);
break;
- case SQLITE3_FLOAT:
+ case SQLITE_FLOAT:
Tcl_SetResult(interp, "FLOAT", TCL_STATIC);
break;
- case SQLITE3_TEXT:
+ case SQLITE_TEXT:
Tcl_SetResult(interp, "TEXT", TCL_STATIC);
break;
- case SQLITE3_BLOB:
+ case SQLITE_BLOB:
Tcl_SetResult(interp, "BLOB", TCL_STATIC);
break;
default:
diff --git a/src/test5.c b/src/test5.c
index f42840169..4409e9447 100644
--- a/src/test5.c
+++ b/src/test5.c
@@ -15,10 +15,10 @@
** is used for testing the SQLite routines for converting between
** the various supported unicode encodings.
**
-** $Id: test5.c,v 1.5 2004/05/22 03:05:34 danielk1977 Exp $
+** $Id: test5.c,v 1.6 2004/05/31 18:51:58 drh Exp $
*/
#include "sqliteInt.h"
-#include "os.h" /* to get SQLITE3_BIGENDIAN */
+#include "os.h" /* to get SQLITE_BIGENDIAN */
#include "tcl.h"
#include <stdlib.h>
#include <string.h>
@@ -167,7 +167,7 @@ static int sqlite_utf16to8(
}
in = Tcl_GetByteArrayFromObj(objv[1], 0);
- out = sqlite3utf16to8(in, -1, SQLITE3_BIGENDIAN);
+ out = sqlite3utf16to8(in, -1, SQLITE_BIGENDIAN);
res = Tcl_NewByteArrayObj(out, strlen(out)+1);
sqliteFree(out);
@@ -221,6 +221,3 @@ int Sqlitetest5_Init(Tcl_Interp *interp){
return TCL_OK;
}
-
-
-
diff --git a/src/tokenize.c b/src/tokenize.c
index 35ee9251f..37d7b9f53 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
** individual tokens and sends those tokens one-by-one over to the
** parser for analysis.
**
-** $Id: tokenize.c,v 1.74 2004/05/27 23:56:16 danielk1977 Exp $
+** $Id: tokenize.c,v 1.75 2004/05/31 18:51:58 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -702,10 +702,9 @@ int sqlite3_complete(const char *zSql){
*/
int sqlite3_complete16(const void *zSql){
int rc;
- char *zSql8 = sqlite3utf16to8(zSql, -1, SQLITE3_BIGENDIAN);
+ char *zSql8 = sqlite3utf16to8(zSql, -1, SQLITE_BIGENDIAN);
if( !zSql8 ) return 0;
rc = sqlite3_complete(zSql8);
sqliteFree(zSql8);
return rc;
}
-
diff --git a/src/utf.c b/src/utf.c
index 72944c812..5b5507823 100644
--- a/src/utf.c
+++ b/src/utf.c
@@ -12,7 +12,7 @@
** This file contains routines used to translate between UTF-8,
** UTF-16, UTF-16BE, and UTF-16LE.
**
-** $Id: utf.c,v 1.14 2004/05/29 02:44:02 danielk1977 Exp $
+** $Id: utf.c,v 1.15 2004/05/31 18:51:58 drh Exp $
**
** Notes on UTF-8:
**
@@ -62,9 +62,9 @@ struct UtfString {
/* TODO: Implement this macro in os.h. It should be 1 on big-endian
** machines, and 0 on little-endian.
*/
-#define SQLITE3_NATIVE_BIGENDIAN 0
+#define SQLITE_NATIVE_BIGENDIAN 0
-#if SQLITE3_NATIVE_BIGENDIAN == 1
+#if SQLITE_NATIVE_BIGENDIAN == 1
#define BOM_BIGENDIAN 0x0000FFFE
#define BOM_LITTLEENDIAN 0x0000FEFF
#else
@@ -523,7 +523,7 @@ static void utf16to16(void *pData, int N, int big_endian){
inout.n = sqlite3utf16ByteLen(inout.pZ, -1);
}
- if( readUtf16Bom(&inout, SQLITE3_BIGENDIAN)!=big_endian ){
+ if( readUtf16Bom(&inout, SQLITE_BIGENDIAN)!=big_endian ){
/* swab(&inout.pZ[inout.c], inout.pZ, inout.n-inout.c); */
int i;
for(i=0; i<(inout.n-inout.c); i += 2){
diff --git a/src/vdbe.c b/src/vdbe.c
index 390924b5d..1698584fe 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
-** $Id: vdbe.c,v 1.352 2004/05/31 10:01:35 danielk1977 Exp $
+** $Id: vdbe.c,v 1.353 2004/05/31 18:51:58 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -138,18 +138,18 @@ int sqlite3_interrupt_count = 0;
static void _storeTypeInfo(Mem *pMem){
int flags = pMem->flags;
if( flags & MEM_Null ){
- pMem->type = SQLITE3_NULL;
+ pMem->type = SQLITE_NULL;
}
else if( flags & MEM_Int ){
- pMem->type = SQLITE3_INTEGER;
+ pMem->type = SQLITE_INTEGER;
}
else if( flags & MEM_Real ){
- pMem->type = SQLITE3_FLOAT;
+ pMem->type = SQLITE_FLOAT;
}
else if( flags & MEM_Str ){
- pMem->type = SQLITE3_TEXT;
+ pMem->type = SQLITE_TEXT;
}else{
- pMem->type = SQLITE3_BLOB;
+ pMem->type = SQLITE_BLOB;
}
}
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index a7f0dbf75..a0a57dcc2 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -124,8 +124,8 @@ struct Sorter {
**
** Each value has a manifest type. The manifest type of the value stored
** in a Mem struct is returned by the MemType(Mem*) macro. The type is
-** one of SQLITE3_NULL, SQLITE3_INTEGER, SQLITE3_REAL, SQLITE3_TEXT or
-** SQLITE3_BLOB.
+** one of SQLITE_NULL, SQLITE_INTEGER, SQLITE_REAL, SQLITE_TEXT or
+** SQLITE_BLOB.
*/
struct Mem {
i64 i; /* Integer value */
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 56388fd71..6c685985e 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -497,7 +497,7 @@ int sqlite3_bind_text16(
zData = (void *)(((u8 *)zData) + 2);
nData -= 2;
}else{
- txt_enc = SQLITE3_BIGENDIAN?TEXT_Utf16be:TEXT_Utf16le;
+ txt_enc = SQLITE_BIGENDIAN?TEXT_Utf16be:TEXT_Utf16le;
}
rc = sqlite3VdbeMemSetStr(pVar, zData, nData, txt_enc, eCopy);
if( rc ){
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index ad4207b35..20e2016c3 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -571,30 +571,30 @@ int sqlite3VdbeList(
Op *pOp = &p->aOp[i];
Mem *pMem = p->aStack;
pMem->flags = MEM_Int;
- pMem->type = SQLITE3_INTEGER;
+ pMem->type = SQLITE_INTEGER;
pMem->i = i; /* Program counter */
pMem++;
pMem->flags = MEM_Static|MEM_Str|MEM_Term;
pMem->z = sqlite3OpcodeNames[pOp->opcode]; /* Opcode */
pMem->n = strlen(pMem->z);
- pMem->type = SQLITE3_TEXT;
+ pMem->type = SQLITE_TEXT;
pMem->enc = TEXT_Utf8;
pMem++;
pMem->flags = MEM_Int;
pMem->i = pOp->p1; /* P1 */
- pMem->type = SQLITE3_INTEGER;
+ pMem->type = SQLITE_INTEGER;
pMem++;
pMem->flags = MEM_Int;
pMem->i = pOp->p2; /* P2 */
- pMem->type = SQLITE3_INTEGER;
+ pMem->type = SQLITE_INTEGER;
pMem++;
pMem->flags = MEM_Short|MEM_Str|MEM_Term; /* P3 */
pMem->z = displayP3(pOp, pMem->zShort, sizeof(pMem->zShort));
- pMem->type = SQLITE3_TEXT;
+ pMem->type = SQLITE_TEXT;
pMem->enc = TEXT_Utf8;
p->nResColumn = 5;
diff --git a/src/vdbemem.c b/src/vdbemem.c
index fbc3ef7b7..eaa3b7d59 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -179,7 +179,7 @@ int sqlite3VdbeMemStringify(Mem *pMem, int enc){
** FIX ME: It would be better if sqlite3_snprintf() could do UTF-16.
*/
u8 *z = pMem->zShort;
- if( fg & MEM_Real || (pMem->type==SQLITE3_FLOAT) ){
+ if( fg & MEM_Real || (pMem->type==SQLITE_FLOAT) ){
sqlite3_snprintf(NBFS, z, "%.15g", pMem->r);
}else{
assert( fg & MEM_Int );
@@ -236,7 +236,7 @@ int sqlite3VdbeMemIntegerify(Mem *pMem){
int sqlite3VdbeMemRealify(Mem *pMem){
if( pMem->flags & MEM_Real ){
/* Do nothing */
- }else if( (pMem->flags & MEM_Int) && pMem->type!=SQLITE3_TEXT ){
+ }else if( (pMem->flags & MEM_Int) && pMem->type!=SQLITE_TEXT ){
pMem->r = pMem->i;
}else if( pMem->flags & (MEM_Str|MEM_Blob) ){
if( sqlite3VdbeChangeEncoding(pMem, TEXT_Utf8)
@@ -258,7 +258,7 @@ int sqlite3VdbeMemRealify(Mem *pMem){
void sqlite3VdbeMemSetNull(Mem *pMem){
releaseMem(pMem);
pMem->flags = MEM_Null;
- pMem->type = SQLITE3_NULL;
+ pMem->type = SQLITE_NULL;
}
/*
@@ -269,7 +269,7 @@ void sqlite3VdbeMemSetInt64(Mem *pMem, i64 val){
releaseMem(pMem);
pMem->i = val;
pMem->flags = MEM_Int;
- pMem->type = SQLITE3_INTEGER;
+ pMem->type = SQLITE_INTEGER;
}
/*
@@ -280,7 +280,7 @@ void sqlite3VdbeMemSetDouble(Mem *pMem, double val){
releaseMem(pMem);
pMem->r = val;
pMem->flags = MEM_Real;
- pMem->type = SQLITE3_FLOAT;
+ pMem->type = SQLITE_FLOAT;
}
/*
@@ -310,7 +310,7 @@ int sqlite3VdbeMemSetStr(
releaseMem(pMem);
if( !z ){
pMem->flags = MEM_Null;
- pMem->type = SQLITE3_NULL;
+ pMem->type = SQLITE_NULL;
return SQLITE_OK;
}
@@ -321,7 +321,7 @@ int sqlite3VdbeMemSetStr(
pMem->flags = MEM_Static;
}
pMem->enc = enc;
- pMem->type = enc==0 ? SQLITE3_BLOB : SQLITE3_TEXT;
+ pMem->type = enc==0 ? SQLITE_BLOB : SQLITE_TEXT;
pMem->n = n;
switch( enc ){
case 0:
@@ -491,7 +491,7 @@ int sqlite3VdbeMemFromBtree(
}
pMem->z = zData;
pMem->enc = 0;
- pMem->type = SQLITE3_BLOB;
+ pMem->type = SQLITE_BLOB;
if( key ){
rc = sqlite3BtreeKey(pCur, offset, amt, zData);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 21:06:13 +0000