From: shaneh Date: Tue, 5 Jan 2010 14:18:54 +0000 (+0000) Subject: Removed compiler warnings in MSVC. X-Git-Tag: version-3.7.2~664 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb6b9878d7a0f04d589bdffad12c7358816dff4e;p=thirdparty%2Fsqlite.git Removed compiler warnings in MSVC. FossilOrigin-Name: 4ecb4725b76042ac414caf90039d5d0a5f8f7068 --- diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c index 8d3b32f12b..287c68b13b 100644 --- a/ext/fts3/fts3_snippet.c +++ b/ext/fts3/fts3_snippet.c @@ -839,7 +839,7 @@ static int fts3LoadSnippetBuffer( while( iPrev<(iPos+SNIPPET_BUFFER_CHUNK) ){ if( iPrev>=iPos ){ - aBuffer[iPrev&SNIPPET_BUFFER_MASK] = i+1; + aBuffer[iPrev&SNIPPET_BUFFER_MASK] = (u8)(i+1); } if( 0==((*pList)&0xFE) ){ nFin++; @@ -1033,7 +1033,7 @@ static int fts3StringAppend( int nAppend ){ if( nAppend<0 ){ - nAppend = strlen(zAppend); + nAppend = (int)strlen(zAppend); } if( pStr->n+nAppend+1>=pStr->nAlloc ){ diff --git a/manifest b/manifest index fe4ee99deb..fdd8bc186e 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Make\ssure\snew\spages\sare\szeroed\seven\swhen\sloading\sa\sfreelist\spage\susing\sthe\nnoContent\soption.\s\sThis\sprevents\sa\sharmless\svalgrind\swarning. -D 2010-01-05T13:40:35 +C Removed\scompiler\swarnings\sin\sMSVC. +D 2010-01-05T14:18:54 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -67,7 +64,7 @@ F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295 F ext/fts3/fts3_porter.c a651e287e02b49b565a6ccf9441959d434489156 -F ext/fts3/fts3_snippet.c a11d9f293eb92fb07ac26a994d0aa2bc35fe1c2a +F ext/fts3/fts3_snippet.c 0e38f76c5992dd08d20fc81e1265763370f9ea4f F ext/fts3/fts3_tokenizer.c 1a49ee3d79cbf0b9386250370d9cbfe4bb89c8ff F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3 F ext/fts3/fts3_tokenizer1.c 11a604a53cff5e8c28882727bf794e5252e5227b @@ -786,14 +783,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P e5d07045fabe0803715cfb291aa9e971235cb08a -R 9204573cc57fc8c565280f450d5531c6 -U drh -Z a6765f277796358c7e24877831e1596a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFLQ0FWoxKgR168RlERAmCCAJ0cj/UiTlS2LANp0D5MtDxf6bDBRgCeOduF -gxI5LlY5wNHX6CO/q6BHQWs= -=chCy ------END PGP SIGNATURE----- +P e47e213369a2652d7eb6bddd58617959e21ca82b +R 8c69565948e98c03e3dd1dcbed92c860 +U shaneh +Z 284bd0937947741c0c0c56667a238f6a diff --git a/manifest.uuid b/manifest.uuid index b5a3fc658f..323dd7dfd0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e47e213369a2652d7eb6bddd58617959e21ca82b \ No newline at end of file +4ecb4725b76042ac414caf90039d5d0a5f8f7068 \ No newline at end of file