aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
-rw-r--r--src/vdbe.c13
3 files changed, 14 insertions, 13 deletions
diff --git a/manifest b/manifest
index a049de7ba..b97a7e359 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3_value_*()\saccess\sfunctions.\s(CVS\s1447)
-D 2004-05-24T09:10:11
+C Fix\stypo\sin\svdbe.c\sfrom\sprevious\scommit.\s(CVS\s1448)
+D 2004-05-24T09:15:39
F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -69,7 +69,7 @@ F src/update.c 1a5e9182596f3ea8c7a141e308a3d2a7e5689fee
F src/utf.c 441c5918ee3777cd8e9611cbb810312ed314737d
F src/util.c 4c0adcbc9ce6678dd046931253e45d623c6d279f
F src/vacuum.c 8734f89742f246abd91dbd3e087fc153bddbfbad
-F src/vdbe.c 8030d32775e2c6bb2bc7d50408926c7c6ab8994a
+F src/vdbe.c f80d8f00766babde444ddfee278532b3637caa7b
F src/vdbe.h 391d5642a83af686f35c228fcd36cb4456d68f44
F src/vdbeInt.h 6c2444a60fc030b275dc0cff407cdaa79d84ce86
F src/vdbeaux.c 7f0c4ad22d5e61465d509467e2535293b468373a
@@ -202,7 +202,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 8104baf23dd28fc982cf260e3e8c90f0c582f602
-R de171e08cb8ad22dd0f7f4b92735f6a5
+P 4bf925fcfccb18e66be031f8a234f370d581e9ea
+R 5cf933e584ede2104c85ca14ff28825c
U danielk1977
-Z 3878ff3f2482ddd072015da408058403
+Z 737004ce498e3b3e5dc54e69cd512626
diff --git a/manifest.uuid b/manifest.uuid
index b09801751..6dcb54e50 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4bf925fcfccb18e66be031f8a234f370d581e9ea \ No newline at end of file
+a554bf6c7075839f760a2ff944ac61b32cab0821 \ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index cb540592e..e4d814b86 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.324 2004/05/24 09:10:11 danielk1977 Exp $
+** $Id: vdbe.c,v 1.325 2004/05/24 09:15:39 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -645,7 +645,7 @@ int sqlite3_value_bytes(sqlite3_value *pVal){
** Return the number of bytes of data that will be returned by the
** equivalent sqlite3_value_data16() call.
*/
-int sqlite3_value_bytes(sqlite3_value *pVal){
+int sqlite3_value_bytes16(sqlite3_value *pVal){
if( sqlite3_value_data16(pVal) ){
return ((Mem *)pVal)->n;
}
@@ -666,10 +666,10 @@ long long int sqlite3_value_int(sqlite3_value *pVal){
** Return the value of the sqlite_value* argument coerced to a 64-bit
** IEEE float.
*/
-double sqlite3_value_float(sqlite3_value*){
- pVal = &pVm->pTos[(1-vals)+i];
- Realify(pVal, flagsToEnc(pMem->flags));
- return pVal->r;
+double sqlite3_value_float(sqlite3_value *pVal){
+ Mem *pMem = (Mem *)pVal;
+ Realify(pMem, flagsToEnc(pMem->flags));
+ return pMem->r;
}
/*
@@ -734,6 +734,7 @@ double sqlite3_column_float(sqlite3_stmt *pStmt, int i){
return 0;
}
+ pVal = &pVm->pTos[(1-vals)+i];
return sqlite3_value_float(pVal);
}