From: drh <drh@noemail.net>
Date: Fri, 11 Nov 2016 20:37:27 +0000 (+0000)
Subject: Fix harmless compiler warnings in test code for MSVC.
X-Git-Tag: version-3.16.0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48c286fc619cbbc23290c05a46e9718f1e0e0357;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in test code for MSVC.

FossilOrigin-Name: 7b76be4117f4e57091b03fafcf42d17bce81160d
---

48c286fc619cbbc23290c05a46e9718f1e0e0357
diff --cc manifest
index 77b57f712b,cca6f193f0..a05d8400b0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sstoring\sredundant\sfields\sin\ssorter\srecords\swhen\sthe\ssort-key\s\nand\sdata\shave\sfields\sin\scommon.
- D 2016-11-11T19:08:00.236
 -C Remove\sobselete\sand\sunused\slogic\sin\sthe\supdate\scode\sgenerator.\nFix\sthe\ssqlite3BtreeMovetoUnpacked()\sroutine\sso\sthat\sit\sremembers\sthe\nrowid\sof\sthe\srow\sthat\sit\slanded\son.
 -D 2016-11-11T18:19:05.491
++C Fix\sharmless\scompiler\swarnings\sin\stest\scode\sfor\sMSVC.
++D 2016-11-11T20:37:27.949
  F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@@ -410,10 -410,10 +410,10 @@@ F src/test_async.c 195ab49da082053fdb0f
  F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
  F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
--F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d
++F src/test_blob.c 6a4c7920d1d9c6cc0f7aa50c89c4f80016aeda83
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
  F src/test_config.c 371853b4691b482ec0bcdf77ec9e3f96dca75b04
--F src/test_delete.c 32690ea215abf29dda589a580cd1b790389759b6
++F src/test_delete.c 8499d4d323f2ec8e28301deb3d6ddd8eef8b8139
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
@@@ -1532,8 -1532,7 +1532,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 925840cfdb969a76640a1247cc4a7b2c0de5cb74 dd62d2de6eb12dc1902d6df050c395b1dcac01b4
- R 710cd32b5d7d9f26ab9c8738e2187743
- T +closed dd62d2de6eb12dc1902d6df050c395b1dcac01b4
 -P 5515b827dc1805a3010018cd6abf222b03525d24
 -R d4149095f37aacb5dfcbf6f677226eee
++P b835cf3e507b910b6a3e0f802ce2c40a72d0c227 1a587d72f981cb7064cfd8916a52a83ad9ba6074
++R 306c4a48ed6a27b97773f1003470ed23
  U drh
- Z 2fa3093086a563b78a5be35466f1815c
 -Z dccbc7ad9f33eb000a7232f3de148136
++Z d9323491e79664d0c5f2710508245de6
diff --cc manifest.uuid
index 438f434a70,273415e51b..c724c9d945
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b835cf3e507b910b6a3e0f802ce2c40a72d0c227
 -1a587d72f981cb7064cfd8916a52a83ad9ba6074
++7b76be4117f4e57091b03fafcf42d17bce81160d
diff --cc src/test_blob.c
index 3ac6c11421,3ac6c11421..7fa733bee9
--- a/src/test_blob.c
+++ b/src/test_blob.c
@@@ -114,7 -114,7 +114,7 @@@ static int SQLITE_TCLAPI test_blob_open
    const char *zVarname;
    int nVarname;
  
--  sqlite3_blob *pBlob = (sqlite3_blob*)0xFFFFFFFF;
++  sqlite3_blob *pBlob = (sqlite3_blob*)&flags;   /* Non-zero initialization */
    int rc;
  
    if( objc!=8 ){
diff --cc src/test_delete.c
index 6b3d9e85a1,6b3d9e85a1..731f11e257
--- a/src/test_delete.c
+++ b/src/test_delete.c
@@@ -47,7 -47,7 +47,7 @@@
  */
  static void sqlite3Delete83Name(char *z){
    int i, sz;
--  sz = strlen(z);
++  sz = (int)strlen(z);
    for(i=sz-1; i>0 && z[i]!='/' && z[i]!='.'; i--){}
    if( z[i]=='.' && (sz>i+4) ) memmove(&z[i+1], &z[sz-3], 4);
  }
@@@ -105,7 -105,7 +105,7 @@@ int sqlite3_delete_database
  
    /* Allocate a buffer large enough for any of the files that need to be
    ** deleted.  */
--  nBuf = strlen(zFile) + 100;
++  nBuf = (int)strlen(zFile) + 100;
    zBuf = (char*)sqlite3_malloc(nBuf);
    if( zBuf==0 ) return SQLITE_NOMEM;