Modifications to avoid signed/unsigned warnings in vdbe.c. (CVS 5912)
FossilOrigin-Name: 9939dd839ac13708f9b5b877c48729b1781eedf3
This commit is contained in:
danielk1977
parent
89d4004f03
commit
64202cfec6
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
||||
C Changes\sto\sbtree.c\sto\savoid\sthe\sunsigned/signed\scomparison\swarnings.\s(CVS\s5911)
|
||||
D 2008-11-17T14:20:56
|
||||
C Modifications\sto\savoid\ssigned/unsigned\swarnings\sin\svdbe.c.\s(CVS\s5912)
|
||||
D 2008-11-17T15:31:48
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -154,7 +154,7 @@ F src/select.c b03c6fe474ded7bd110ca7b551bf0236133c12da
|
||||
F src/shell.c 650d1a87408682280d0e9d014d0d328c59c84b38
|
||||
F src/sqlite.h.in 85e159e1d634c84ddbf87481293d5b1d26e2d27b
|
||||
F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
|
||||
F src/sqliteInt.h 338ab7f86950b00225c94efbc9be133e1bafcb2c
|
||||
F src/sqliteInt.h 4c6b4f79adee01ad300df2ad6a568d7d6778a171
|
||||
F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
|
||||
F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
|
||||
F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
|
||||
@ -192,9 +192,9 @@ F src/update.c f22a6f4507f9a0ef082418919382f83b90fd2e63
|
||||
F src/utf.c 86dc0f8076f606432a01f1498ae054c32de1f9d2
|
||||
F src/util.c afe659ccc05d1f8af9e8631dabfec3ee3a7144af
|
||||
F src/vacuum.c fd77433d0c26d3ff1eb96eab017a1787ac5aa642
|
||||
F src/vdbe.c c15dc80bd1a5dcb83a91792976eacf434d691ef6
|
||||
F src/vdbe.c c5270245fcb5368634a9301481ab94a22e7a21b2
|
||||
F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
|
||||
F src/vdbeInt.h c9400778d6f801c2cb8ebe6151c909e19dd2d793
|
||||
F src/vdbeInt.h 6b1082480832d406c57a7f469a1c61f1a8759aca
|
||||
F src/vdbeapi.c ea22e171704906632cd971668359b8c0c5053001
|
||||
F src/vdbeaux.c 8915d2367a3f338858b3dd29878a69ecd6904147
|
||||
F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
|
||||
@ -658,7 +658,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P f45a1493636a5ee474dd6c0b5d286be2249b05aa
|
||||
R 50f7eba21e52de2f9aa5b18b2d732bec
|
||||
P 24469dbace433ca89e22274f741f382052c5d17d
|
||||
R 86af6bd4f9efc8d3b9152888fbd7f659
|
||||
U danielk1977
|
||||
Z 0d366bf019e2804c6db4be64911fab44
|
||||
Z ae7d54eb840025efcb4da89e2a313806
|
||||
|
||||
@ -1 +1 @@
|
||||
24469dbace433ca89e22274f741f382052c5d17d
|
||||
9939dd839ac13708f9b5b877c48729b1781eedf3
|
||||
@ -11,7 +11,7 @@
|
||||
*************************************************************************
|
||||
** Internal interface definitions for SQLite.
|
||||
**
|
||||
** @(#) $Id: sqliteInt.h,v 1.792 2008/11/13 18:00:15 danielk1977 Exp $
|
||||
** @(#) $Id: sqliteInt.h,v 1.793 2008/11/17 15:31:48 danielk1977 Exp $
|
||||
*/
|
||||
#ifndef _SQLITEINT_H_
|
||||
#define _SQLITEINT_H_
|
||||
@ -685,7 +685,7 @@ struct sqlite3 {
|
||||
CollSeq *pDfltColl; /* The default collating sequence (BINARY) */
|
||||
i64 lastRowid; /* ROWID of most recent insert (see above) */
|
||||
i64 priorNewRowid; /* Last randomly generated ROWID */
|
||||
int magic; /* Magic number for detect library misuse */
|
||||
u32 magic; /* Magic number for detect library misuse */
|
||||
int nChange; /* Value returned by sqlite3_changes() */
|
||||
int nTotalChange; /* Value returned by sqlite3_total_changes() */
|
||||
sqlite3_mutex *mutex; /* Connection mutex */
|
||||
@ -2335,8 +2335,8 @@ int sqlite3VarintLen(u64 v);
|
||||
** x = putVarint32( A, B );
|
||||
**
|
||||
*/
|
||||
#define getVarint32(A,B) ((*(A)<(unsigned char)0x80) ? ((B) = (u32)*(A)),1 : sqlite3GetVarint32((A), &(B)))
|
||||
#define putVarint32(A,B) (((B)<(u32)0x80) ? (*(A) = (unsigned char)(B)),1 : sqlite3PutVarint32((A), (B)))
|
||||
#define getVarint32(A,B) ((*(A)<(unsigned char)0x80) ? ((B) = (u32)*(A)),1 : sqlite3GetVarint32((A), (u32 *)&(B)))
|
||||
#define putVarint32(A,B) (((u32)(B)<(u32)0x80) ? (*(A) = (unsigned char)(B)),1 : sqlite3PutVarint32((A), (B)))
|
||||
#define getVarint sqlite3GetVarint
|
||||
#define putVarint sqlite3PutVarint
|
||||
|
||||
|
||||
19
src/vdbe.c
19
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.787 2008/11/13 18:29:51 shane Exp $
|
||||
** $Id: vdbe.c,v 1.788 2008/11/17 15:31:48 danielk1977 Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include <ctype.h>
|
||||
@ -177,7 +177,7 @@ static const unsigned char opcodeProperty[] = OPFLG_INITIALIZER;
|
||||
** specified by mask.
|
||||
*/
|
||||
int sqlite3VdbeOpcodeHasProperty(int opcode, int mask){
|
||||
assert( opcode>0 && opcode<sizeof(opcodeProperty) );
|
||||
assert( opcode>0 && opcode<(int)sizeof(opcodeProperty) );
|
||||
return (opcodeProperty[opcode]&mask)!=0;
|
||||
}
|
||||
|
||||
@ -552,7 +552,6 @@ int sqlite3VdbeExec(
|
||||
#endif
|
||||
UnpackedRecord aTempRec[16]; /* Space to hold a transient UnpackedRecord */
|
||||
|
||||
|
||||
assert( p->magic==VDBE_MAGIC_RUN ); /* sqlite3_step() verifies this */
|
||||
assert( db->magic==SQLITE_MAGIC_BUSY );
|
||||
sqlite3BtreeMutexArrayEnter(&p->aMutex);
|
||||
@ -1964,7 +1963,7 @@ case OP_SetNumColumns: {
|
||||
** the result.
|
||||
*/
|
||||
case OP_Column: {
|
||||
u32 payloadSize; /* Number of bytes in the record */
|
||||
int payloadSize; /* Number of bytes in the record */
|
||||
int p1 = pOp->p1; /* P1 value of the opcode */
|
||||
int p2 = pOp->p2; /* column number to retrieve */
|
||||
VdbeCursor *pC = 0;/* The VDBE cursor */
|
||||
@ -1972,7 +1971,7 @@ case OP_Column: {
|
||||
BtCursor *pCrsr; /* The BTree cursor */
|
||||
u32 *aType; /* aType[i] holds the numeric type of the i-th column */
|
||||
u32 *aOffset; /* aOffset[i] is offset to start of data for i-th column */
|
||||
u32 nField; /* number of fields in the record */
|
||||
int nField; /* number of fields in the record */
|
||||
int len; /* The length of the serialized data for the column */
|
||||
int i; /* Loop counter */
|
||||
char *zData; /* Part of the record being decoded */
|
||||
@ -2020,7 +2019,7 @@ case OP_Column: {
|
||||
sqlite3BtreeKeySize(pCrsr, &payloadSize64);
|
||||
payloadSize = payloadSize64;
|
||||
}else{
|
||||
sqlite3BtreeDataSize(pCrsr, &payloadSize);
|
||||
sqlite3BtreeDataSize(pCrsr, (u32 *)&payloadSize);
|
||||
}
|
||||
nField = pC->nField;
|
||||
}else{
|
||||
@ -2054,7 +2053,7 @@ case OP_Column: {
|
||||
}else{
|
||||
u8 *zIdx; /* Index into header */
|
||||
u8 *zEndHdr; /* Pointer to first byte after the header */
|
||||
u32 offset; /* Offset into the data */
|
||||
int offset; /* Offset into the data */
|
||||
int szHdrSz; /* Size of the header size field at start of record */
|
||||
int avail; /* Number of bytes of available data */
|
||||
|
||||
@ -2255,7 +2254,7 @@ case OP_MakeRecord: {
|
||||
Mem *pRec; /* The new record */
|
||||
u64 nData = 0; /* Number of bytes of data space */
|
||||
int nHdr = 0; /* Number of bytes of header space */
|
||||
u64 nByte = 0; /* Data space required for this record */
|
||||
i64 nByte = 0; /* Data space required for this record */
|
||||
int nZero = 0; /* Number of zero bytes at the end of the record */
|
||||
int nVarint; /* Number of bytes in a varint */
|
||||
u32 serial_type; /* Type field */
|
||||
@ -3328,7 +3327,7 @@ case OP_NewRowid: { /* out2-prerelease */
|
||||
** Others complain about 0x7ffffffffffffffffLL. The following macro seems
|
||||
** to provide the constant while making all compilers happy.
|
||||
*/
|
||||
# define MAX_ROWID ( (((u64)0x7fffffff)<<32) | (u64)0xffffffff )
|
||||
# define MAX_ROWID (i64)( (((u64)0x7fffffff)<<32) | (u64)0xffffffff )
|
||||
#endif
|
||||
|
||||
if( !pC->useRandomRowid ){
|
||||
@ -3634,7 +3633,7 @@ case OP_RowData: {
|
||||
n = n64;
|
||||
}else{
|
||||
sqlite3BtreeDataSize(pCrsr, &n);
|
||||
if( n>db->aLimit[SQLITE_LIMIT_LENGTH] ){
|
||||
if( (int)n>db->aLimit[SQLITE_LIMIT_LENGTH] ){
|
||||
goto too_big;
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
** 6000 lines long) it was split up into several smaller files and
|
||||
** this header information was factored out.
|
||||
**
|
||||
** $Id: vdbeInt.h,v 1.157 2008/11/05 16:37:35 drh Exp $
|
||||
** $Id: vdbeInt.h,v 1.158 2008/11/17 15:31:48 danielk1977 Exp $
|
||||
*/
|
||||
#ifndef _VDBEINT_H_
|
||||
#define _VDBEINT_H_
|
||||
@ -296,7 +296,7 @@ struct Vdbe {
|
||||
Mem *aVar; /* Values for the OP_Variable opcode. */
|
||||
char **azVar; /* Name of variables */
|
||||
int okVar; /* True if azVar[] has been initialized */
|
||||
int magic; /* Magic number for sanity checking */
|
||||
u32 magic; /* Magic number for sanity checking */
|
||||
int nMem; /* Number of memory locations currently allocated */
|
||||
Mem *aMem; /* The memory locations */
|
||||
int nCallback; /* Number of callbacks invoked so far */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user