aboutsummaryrefslogtreecommitdiff
path: root/tool/sqldiff.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-05-04 15:04:47 +0000
committerdrh <drh@noemail.net>2015-05-04 15:04:47 +0000
commit33aa4dbe4463396f89651d99181c9bb692bedc30 (patch)
tree168a02d195467ea21ece3275dc954667c8bb4bda /tool/sqldiff.c
parent9a9219ff24168c3f35b1353c4d646962979cd87d (diff)
downloadsqlite-33aa4dbe4463396f89651d99181c9bb692bedc30.tar.gz
sqlite-33aa4dbe4463396f89651d99181c9bb692bedc30.zip
Fix a bug in --changeset output for sqldiff.exe for floating-point values.
Also fix harmless compiler warnings in sqldiff.exe. FossilOrigin-Name: 9f428530f9a6cb54f0a2fc3e666c38c7c093558a
Diffstat (limited to 'tool/sqldiff.c')
-rw-r--r--tool/sqldiff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index bfe72c4f5..0b3f02cd6 100644
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -897,19 +897,19 @@ static void putValue(FILE *out, sqlite3_value *pVal){
for(j=56; j>=0; j-=8) putc((uX>>j)&0xff, out);
break;
case SQLITE_FLOAT:
- rX = sqlite3_value_int64(pVal);
+ rX = sqlite3_value_double(pVal);
memcpy(&uX, &rX, 8);
for(j=56; j>=0; j-=8) putc((uX>>j)&0xff, out);
break;
case SQLITE_TEXT:
iX = sqlite3_value_bytes(pVal);
putsVarint(out, (sqlite3_uint64)iX);
- fwrite(sqlite3_value_text(pVal),1,iX,out);
+ fwrite(sqlite3_value_text(pVal),1,(size_t)iX,out);
break;
case SQLITE_BLOB:
iX = sqlite3_value_bytes(pVal);
putsVarint(out, (sqlite3_uint64)iX);
- fwrite(sqlite3_value_blob(pVal),1,iX,out);
+ fwrite(sqlite3_value_blob(pVal),1,(size_t)iX,out);
break;
case SQLITE_NULL:
break;
@@ -1136,7 +1136,7 @@ int main(int argc, char **argv){
FILE *out = stdout;
void (*xDiff)(const char*,FILE*) = diff_one_table;
int nExt = 0;
- const char **azExt = 0;
+ char **azExt = 0;
g.zArgv0 = argv[0];
for(i=1; i<argc; i++){