From 9958f58fda11df2ee27e13d0c2fef7c761ae35b1 Mon Sep 17 00:00:00 2001
From: Adam Kennedy <adamk@cpan.org>
Date: Sun, 19 Apr 2009 09:16:22 +0000
Subject: [PATCH] Reverting corion's Win32 64-bit changes

---
 .gitignore        |  4 ----
 Changes           |  3 ---
 fts3.c            | 12 ++++++------
 fts3_expr.c       | 12 ++++++------
 fts3_porter.c     |  2 +-
 fts3_tokenizer1.c |  2 +-
 lib/DBD/SQLite.pm |  2 +-
 t/lib/Test.pm     |  2 +-
 8 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index d29b39a..7dc7d86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
 *.o
 *.bs
 blib/
-*.def
-dll.base
-dll.def
-dll.exp
 SQLite.c
 *.xsi
 pm_to_blib
diff --git a/Changes b/Changes
index 53487b5..ec04489 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,5 @@
 Changes for Perl extension DBD-SQLite.
 
-1.22_09 Sun 19 Apr 2009
-    - silence(!) Win64 build warnings (BrowserUk)
-
 1.22_08 Fri 17 Apr 2009
     - Completed the migration of all tests and deleted lib.pl (ADAMK)
     - Prevented a double "commit is innefective" warning (ADAMK)
diff --git a/fts3.c b/fts3.c
index f9e3512..19e6495 100644
--- a/fts3.c
+++ b/fts3.c
@@ -1719,7 +1719,7 @@ static char *string_dup_n(const char *s, int n){
  * (We don't use strdup() since it is not part of the standard C library and
  * may not be available everywhere.) */
 static char *string_dup(const char *s){
-  return string_dup_n(s, (int)strlen(s));
+  return string_dup_n(s, strlen(s));
 }
 
 /* Format a string, replacing each occurrence of the % character with
@@ -1742,7 +1742,7 @@ static char *string_format(const char *zFormat,
   }
   len += 1;  /* for null terminator */
 
-  r = result = sqlite3_malloc((int)len);
+  r = result = sqlite3_malloc(len);
   for(p = zFormat; *p; ++p){
     if( *p=='%' ){
       memcpy(r, zDb, nDb);
@@ -2565,7 +2565,7 @@ typedef struct FtsToken {
 */
 static char **tokenizeString(const char *z, int *pnToken){
   int nToken = 0;
-  FtsToken *aToken = sqlite3_malloc( (int)( strlen(z) * sizeof(aToken[0]) ) );
+  FtsToken *aToken = sqlite3_malloc( strlen(z) * sizeof(aToken[0]) );
   int n = 1;
   int e, i;
   int totalSize = 0;
@@ -2765,7 +2765,7 @@ static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
   */
   CLEAR(pSpec);
   for(i=n=0; i<argc; i++){
-    n += (int)( strlen(argv[i]) + 1 );
+    n += strlen(argv[i]) + 1;
   }
   azArg = sqlite3_malloc( sizeof(char*)*argc + n );
   if( azArg==0 ){
@@ -2901,11 +2901,11 @@ static int constructVtab(
     return SQLITE_NOMEM;
   }
 
-  zTok = spec->azTokenizer[0];
+  zTok = spec->azTokenizer[0]; 
   if( !zTok ){
     zTok = "simple";
   }
-  nTok = (int)( strlen(zTok)+1 );
+  nTok = strlen(zTok)+1;
 
   m = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash, zTok, nTok);
   if( !m ){
diff --git a/fts3_expr.c b/fts3_expr.c
index 990dbed..ae11e2d 100644
--- a/fts3_expr.c
+++ b/fts3_expr.c
@@ -358,7 +358,7 @@ static int getNextNode(
         pRet->eType = pKey->eType;
         pRet->nNear = nNear;
         *ppExpr = pRet;
-        *pnConsumed = (int)( (zInput - z) + nKey );
+        *pnConsumed = (zInput - z) + nKey;
         return SQLITE_OK;
       }
 
@@ -378,14 +378,14 @@ static int getNextNode(
       if( rc==SQLITE_OK && !*ppExpr ){
         rc = SQLITE_DONE;
       }
-      *pnConsumed = (int)( (zInput - z) + 1 + nConsumed );
+      *pnConsumed = (zInput - z) + 1 + nConsumed;
       return rc;
     }
-
+  
     /* Check for a close bracket. */
     if( *zInput==')' ){
       pParse->nNest--;
-      *pnConsumed = (int)( (zInput - z) + 1 );
+      *pnConsumed = (zInput - z) + 1;
       return SQLITE_DONE;
     }
   }
@@ -397,7 +397,7 @@ static int getNextNode(
   */
   if( *zInput=='"' ){
     for(ii=1; ii<nInput && zInput[ii]!='"'; ii++);
-    *pnConsumed = (int)( (zInput - z) + ii + 1 );
+    *pnConsumed = (zInput - z) + ii + 1;
     if( ii==nInput ){
       return SQLITE_ERROR;
     }
@@ -685,7 +685,7 @@ int sqlite3Fts3ExprParse(
     return SQLITE_OK;
   }
   if( n<0 ){
-    n = (int)strlen(z);
+    n = strlen(z);
   }
   rc = fts3ExprParse(&sParse, z, n, ppExpr, &nParsed);
 
diff --git a/fts3_porter.c b/fts3_porter.c
index 4559630..6ff67a9 100644
--- a/fts3_porter.c
+++ b/fts3_porter.c
@@ -547,7 +547,7 @@ static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
   /* z[] is now the stemmed word in reverse order.  Flip it back
   ** around into forward order and return.
   */
-  *pnOut = i = (int)strlen(z);
+  *pnOut = i = strlen(z);
   zOut[i] = 0;
   while( *z ){
     zOut[--i] = *(z++);
diff --git a/fts3_tokenizer1.c b/fts3_tokenizer1.c
index 8ab7d44..da255d9 100644
--- a/fts3_tokenizer1.c
+++ b/fts3_tokenizer1.c
@@ -75,7 +75,7 @@ static int simpleCreate(
   ** information on the initial create.
   */
   if( argc>1 ){
-    int i, n = (int)strlen(argv[1]);
+    int i, n = strlen(argv[1]);
     for(i=0; i<n; i++){
       unsigned char ch = argv[1][i];
       /* We explicitly don't support UTF-8 delimiters for now. */
diff --git a/lib/DBD/SQLite.pm b/lib/DBD/SQLite.pm
index b5d215b..7851140 100644
--- a/lib/DBD/SQLite.pm
+++ b/lib/DBD/SQLite.pm
@@ -8,7 +8,7 @@ use DynaLoader ();
 use vars qw($VERSION @ISA);
 use vars qw{$err $errstr $drh $sqlite_version};
 BEGIN {
-    $VERSION = '1.22_09';
+    $VERSION = '1.22_08';
     @ISA     = ('DynaLoader');
 
     # Initialize errors
diff --git a/t/lib/Test.pm b/t/lib/Test.pm
index 32750aa..61026cf 100644
--- a/t/lib/Test.pm
+++ b/t/lib/Test.pm
@@ -9,7 +9,7 @@ use Test::More ();
 
 use vars qw{$VERSION @ISA @EXPORT};
 BEGIN {
-	$VERSION = '1.22_09';
+	$VERSION = '1.22_08';
 	@ISA     = qw{ Exporter };
 	@EXPORT  = qw{ connect_ok };