From: drh <drh@noemail.net>
Date: Wed, 31 Aug 2005 13:13:31 +0000 (+0000)
Subject: Explicit typecasts to silence nuisance compiler warnings.  Ticket #1398. (CVS 2650)
X-Git-Tag: version-3.6.10~3509
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37108e112a8ce47668416bec16006007bea92954;p=thirdparty%2Fsqlite.git

Explicit typecasts to silence nuisance compiler warnings.  Ticket #1398. (CVS 2650)

FossilOrigin-Name: 90712ea7273597214d6c77a01e41f84146d201c8
---

diff --git a/manifest b/manifest
index e5f0baa90a..1d2bd00382 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refinements\sto\sthe\soptimizer\soverview\sand\sintegration\sinto\sthe\swebsite.\s(CVS\s2649)
-D 2005-08-31T03:13:12
+C Explicit\stypecasts\sto\ssilence\snuisance\scompiler\swarnings.\s\sTicket\s#1398.\s(CVS\s2650)
+D 2005-08-31T13:13:31
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/attach.c 4b21689700a72ae281fa85dbaff06b2a62bd49ee
 F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454
 F src/btree.c 5b3bc015c49a41c025cfdf8ad36051f3007e2cb0
 F src/btree.h 1ed561263ca0e335bc3e81d761c9d5ff8c22f61e
-F src/build.c 150902037cf8f7a9a09b31b753181a1e5aa23633
+F src/build.c d61682e8d0368fbc6ff230cd4b9bd41659d5634b
 F src/callback.c 9a1162c8f9dae9fad6d548339669aacb5f6cf76b
 F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79
 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
@@ -306,7 +306,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0bbe73fccfe52700c2ae1122388764e81a78bc22
-R 116e86a3585b21a6c570826363946445
+P ccd12e9e790e271cb1dbbae1c13e9cb980eaf11d
+R 8c9b4e81c8bbdf0ed64b7f65a0971b7c
 U drh
-Z 913c62cd31e3948a6b55fd91fd72e91a
+Z 3262fbf4b7347c0cb9d90a5c7c2ff379
diff --git a/manifest.uuid b/manifest.uuid
index 94db58d0ac..7af8f95550 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ccd12e9e790e271cb1dbbae1c13e9cb980eaf11d
\ No newline at end of file
+90712ea7273597214d6c77a01e41f84146d201c8
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index d79db7e8cc..fc4a0311f5 100644
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.343 2005/08/29 23:00:04 drh Exp $
+** $Id: build.c,v 1.344 2005/08/31 13:13:31 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2173,7 +2173,7 @@ void sqlite3CreateIndex(
                         (sizeof(int)*2 + sizeof(CollSeq*))*pList->nExpr );
   if( sqlite3_malloc_failed ) goto exit_create_index;
   pIndex->aiColumn = (int*)&pIndex->keyInfo.aColl[pList->nExpr];
-  pIndex->aiRowEst = &pIndex->aiColumn[pList->nExpr];
+  pIndex->aiRowEst = (unsigned*)&pIndex->aiColumn[pList->nExpr];
   pIndex->zName = (char*)&pIndex->aiRowEst[pList->nExpr+1];
   strcpy(pIndex->zName, zName);
   pIndex->pTable = pTab;
@@ -2396,7 +2396,7 @@ exit_create_index:
 ** are based on typical values found in actual indices.
 */
 void sqlite3DefaultRowEst(Index *pIdx){
-  int *a = pIdx->aiRowEst;
+  unsigned *a = pIdx->aiRowEst;
   int i;
   assert( a!=0 );
   a[0] = 1000000;