From 5a12e689862ab0809b06ea8a759eadb2e255ef3b Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 19 May 2004 11:24:25 +0000 Subject: [PATCH] Variable name change: azVar to apVar. (CVS 1404) FossilOrigin-Name: 45169ce015da07da9a874b5b075ea6a05f59f162 --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- src/vdbe.c | 6 +++--- src/vdbeInt.h | 4 ++-- src/vdbeaux.c | 20 ++++++++++---------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/manifest b/manifest index d4fe030db3..3252367a39 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tests\sfor\stext\sencoding\sconversion\sfunctions.\sAlso\snew\ssqlite3_bindXX\sAPIs.\s(CVS\s1403) -D 2004-05-19T10:36:44 +C Variable\sname\schange:\sazVar\sto\sapVar.\s(CVS\s1404) +D 2004-05-19T11:24:26 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -63,10 +63,10 @@ F src/update.c 0cc7291dd0e0f82cf93085e49c973e8ef9e51fd5 F src/utf.c 48c537bf7990ce32a36b051401874d024ec2a07b F src/util.c b72f775a6c3fa404d70250382f63d708e17bc332 F src/vacuum.c c134702e023db8778e6be59ac0ea7b02315b5476 -F src/vdbe.c f5451f1f71e46acebe0be797a138302b4b7ead43 +F src/vdbe.c 962092231fad5370a57ad5b7398944ca6a27678f F src/vdbe.h 314e9c07db73a42a6ba91ab7539e27652fc88870 -F src/vdbeInt.h 2097f78f8dd0e2abcd1b986ac3e8af484dc5a1e1 -F src/vdbeaux.c 1e1aed6b07a02bf0768c9bf9eae06c9b488c560a +F src/vdbeInt.h 3f76e27be527f4848dc2aae898f2d8709eb1b32c +F src/vdbeaux.c 5743e15988d1cbe2db055c1cb6faaa062c1ec601 F src/where.c 5f480219a943b0fed1f6922d2fdbfba8616a9148 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242 F test/attach.test cb9b884344e6cfa5e165965d5b1adea679a24c83 @@ -193,7 +193,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P a0f3f6ed2327992036267627cf663e5ca56bd3ae -R 2fe56592f6dc9245a3872afd301b1853 -U danielk1977 -Z 72c11613022fdf4360d5afb7ad04e0c8 +P f71844bc27c9fc799af3337daf2a212370d4a724 +R 09bed5008417bd932f4640e166507cff +U drh +Z d3e5bec58d881a9caa41401041151755 diff --git a/manifest.uuid b/manifest.uuid index b9b49a84d5..eff7f46a1d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f71844bc27c9fc799af3337daf2a212370d4a724 \ No newline at end of file +45169ce015da07da9a874b5b075ea6a05f59f162 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index a16fbb5953..65daab0977 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.300 2004/05/19 10:35:01 danielk1977 Exp $ +** $Id: vdbe.c,v 1.301 2004/05/19 11:24:26 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -856,14 +856,14 @@ case OP_Variable: { assert( j>=0 && jnVar ); /* If we need to translate between text encodings, do it now. If this is - ** required, then put the new string in p->azVar. This way, if the + ** required, then put the new string in p->apVar. This way, if the ** variable is used again, even after the virtual machine is reset, the ** conversion won't have to be done again. ** ** TODO: This is where we need to support databases that use other than ** UTF-8 on disk. */ - pVar = &p->azVar[j]; + pVar = &p->apVar[j]; if( pVar->flags&MEM_Str && !(pVar->flags&MEM_Utf8) ){ char *zUtf8; assert( pVar->flags&(MEM_Utf16le|MEM_Utf16be) ); diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 4328d22928..6d99459bbe 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -271,8 +271,8 @@ struct Vdbe { FILE *pFile; /* At most one open file handler */ int nField; /* Number of file fields */ char **azField; /* Data for each file field */ - int nVar; /* Number of entries in azVariable[] */ - Mem *azVar; /* Values for the OP_Variable opcode. */ + int nVar; /* Number of entries in apVar[] */ + Mem *apVar; /* Values for the OP_Variable opcode. */ char *zLine; /* A single line from the input file */ int nLineAlloc; /* Number of spaces allocated for zLine */ int magic; /* Magic number for sanity checking */ diff --git a/src/vdbeaux.c b/src/vdbeaux.c index c2022f9c63..579c80d3a5 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -616,13 +616,13 @@ void sqlite3VdbeMakeReady( n = isExplain ? 10 : p->nOp; p->aStack = sqliteMalloc( n*(sizeof(p->aStack[0]) + 2*sizeof(char*)) /* aStack and zArgv */ - + p->nVar*sizeof(Mem) /* azVar */ + + p->nVar*sizeof(Mem) /* apVar */ ); p->zArgv = (char**)&p->aStack[n]; p->azColName = (char**)&p->zArgv[n]; - p->azVar = (Mem *)&p->azColName[n]; + p->apVar = (Mem *)&p->azColName[n]; for(n=0; nnVar; n++){ - p->azVar[n].flags = MEM_Null; + p->apVar[n].flags = MEM_Null; } } @@ -761,7 +761,7 @@ static void closeAllCursors(Vdbe *p){ ** ** This routine will automatically close any cursors, lists, and/or ** sorters that were left open. It also deletes the values of -** variables in the azVariable[] array. +** variables in the aVar[] array. */ static void Cleanup(Vdbe *p){ int i; @@ -955,7 +955,7 @@ static int vdbeUnbind(Vdbe *p, int i){ return SQLITE_RANGE; } i--; - pVar = &p->azVar[i]; + pVar = &p->apVar[i]; if( pVar->flags&MEM_Dyn ){ sqliteFree(pVar->z); } @@ -978,7 +978,7 @@ static int vdbeBindBlob( Mem *pVar; vdbeUnbind(p, i); - pVar = &p->azVar[i-1]; + pVar = &p->apVar[i-1]; if( zVal ){ pVar->n = bytes; @@ -1009,7 +1009,7 @@ int sqlite3_bind_int64(sqlite3_stmt *p, int i, long long int iValue){ Vdbe *v = (Vdbe *)p; rc = vdbeUnbind(v, i); if( rc==SQLITE_OK ){ - Mem *pVar = &v->azVar[i-1]; + Mem *pVar = &v->apVar[i-1]; pVar->flags = MEM_Int; pVar->i = iValue; } @@ -1025,7 +1025,7 @@ int sqlite3_bind_double(sqlite3_stmt *p, int i, double iValue){ Vdbe *v = (Vdbe *)p; rc = vdbeUnbind(v, i); if( rc==SQLITE_OK ){ - Mem *pVar = &v->azVar[i-1]; + Mem *pVar = &v->apVar[i-1]; pVar->flags = MEM_Real; pVar->r = iValue; } @@ -1115,8 +1115,8 @@ void sqlite3VdbeDelete(Vdbe *p){ } } for(i=0; inVar; i++){ - if( p->azVar[i].flags&MEM_Dyn ){ - sqliteFree(p->azVar[i].z); + if( p->apVar[i].flags&MEM_Dyn ){ + sqliteFree(p->apVar[i].z); } } sqliteFree(p->aOp);