Fix a C++ism in func.c. (CVS 3970)

FossilOrigin-Name: 9c0050a10c6bea75ada902c16eb28eb3cf864718

diff --git a/manifest b/manifest
index f2948266b022c9b081249e44dfb930336ea47152..47df662f8fc420d0b14699431526765ab32aeb55 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\stest\sfor\soverflow\sin\sstrftime().\sIt\swas\snot\sbroken.\s(CVS\s3969)
-D 2007-05-10T11:43:53
+C Fix\sa\sC++ism\sin\sfunc.c.\s(CVS\s3970)
+D 2007-05-10T13:23:23
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -71,7 +71,7 @@ F src/date.c 6049db7d5a8fdf2c677ff7d58fa31d4f6593c988
 F src/delete.c 5c0d89b3ef7d48fe1f5124bfe8341f982747fe29
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
 F src/expr.c 65b8a3dff2cdf1b21292996508688d5a1b93200f
-F src/func.c 6282d2025d8e0db80b43783a4778cbb04e98f2f6
+F src/func.c f57e0111eb0e6335d3673cd4dea3fd69aa9e8743
 F src/hash.c 67b23e14f0257b69a3e8aa663e4eeadc1a2b6fd5
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c e595ca26805dfb3a9ebaabc28e7947c479f3b14d
@@ -486,7 +486,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 2c9c94a24d52a1c9f5d1b32cbdff794a2dd74126
-R 2c47de5a0a5040d7292e87009e059f55
-U danielk1977
-Z 026ef275f84adb6a35527410093e3492
+P 5800d0327ebc122e679ef860b58098b3c08eb709
+R 96efbe11ded0fcf2087a2e2cc7c73f86
+U drh
+Z dd77a8dbef149aca71589b484f8de078

diff --git a/manifest.uuid b/manifest.uuid
index 9da4632a905e26a0b2ca6af56098ea7011890b3d..a071033e91b34f47077506052977e675d1258e60 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5800d0327ebc122e679ef860b58098b3c08eb709
\ No newline at end of file
+9c0050a10c6bea75ada902c16eb28eb3cf864718
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index a8fbe104e1ded51e3703aea50b584bc750eb0627..b2e27f62451696d74cb9cfc9c3051315a43f2ab5 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.153 2007/05/09 08:24:44 danielk1977 Exp $
+** $Id: func.c,v 1.154 2007/05/10 13:23:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -536,6 +536,7 @@ static void likeFunc(
   sqlite3_value **argv
 ){
   const unsigned char *zA, *zB;
+  int escape = 0;
 
   /* Limit the length of the LIKE or GLOB pattern to avoid problems
   ** of deep recursion and N*N behavior in patternCompare().
@@ -547,7 +548,6 @@ static void likeFunc(
 
   zB = sqlite3_value_text(argv[0]);
   zA = sqlite3_value_text(argv[1]);
-  int escape = 0;
   if( argc==3 ){
     /* The escape character string must consist of a single UTF-8 character.
     ** Otherwise, return an error.