Fix the return type on sqliteStrICmp when the input strings are not

equal.  Ticket #804. (CVS 1794)

FossilOrigin-Name: 660b89a0fc031e798ce14f25273468e85e038efa

diff --git a/manifest b/manifest
index 412ba16cfc2b2595803aadcbf3d3cf904dc30f79..61fbed5ff15dbb265d4583b5fa3cfaf23fdc342f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfixes\sin\sthe\swindows\sbuild\sprocess\swithin\sthe\spublish.sh\sscript\s(CVS\s1792)
-D 2004-07-01T11:25:35
+C Fix\sthe\sreturn\stype\son\ssqliteStrICmp\swhen\sthe\sinput\sstrings\sare\snot\nequal.\s\sTicket\s#804.\s(CVS\s1794)
+D 2004-07-15T13:23:22
 F Makefile.in 77d1219b6563476711a7a962e865979a6f314eb0
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -71,7 +71,7 @@ F src/tokenize.c 900374b6b37f04748bcd48c2d29a41c251542935
 F src/trigger.c 6aaf6d79cc2157c70a06031dd1531707d644cfb4
 F src/update.c b66b1896c9da54678ba3eff2bf0b4d291a95986a
 F src/utf.c f03535db72bfa09e24202ccdd245f21d2fc65f0a
-F src/util.c a373ba2f631181b3302f3c2ebdfc9772833c6a17
+F src/util.c 2aacc79b7bf5df5859813dafd3bf3258f67a5234
 F src/vacuum.c b8546f4921719458cc537b9e736df52a8256399c
 F src/vdbe.c ed98f1d70b0d7126c603b086137af85c7b9d7855
 F src/vdbe.h 75b241c02431b9c0f16eaa9cdbb34146c6287f52
@@ -233,7 +233,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 26a559b65835d3da4c853ed87ccdc6bfdf37461c
-R a665a27a6510323a0651f21f51e533c4
+P cda795a1d5549231b767114febd9980c9c70d4d2
+R 55fe007906fbb723a3aa10c7a5b5aec7
 U drh
-Z ecfa9470d2d7ced8aa370bb7591fa175
+Z 679a0d6cb5fbe99afc15185b01eebe74

diff --git a/manifest.uuid b/manifest.uuid
index b1ed0fd6d5a5411bd971ee300e03fe0d7c291c30..4c19bb25c055e29869c11186bfd5e2653551389d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cda795a1d5549231b767114febd9980c9c70d4d2
\ No newline at end of file
+660b89a0fc031e798ce14f25273468e85e038efa
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index c62bdd28a24925b267b35873db7f571f7123a608..e2c5733a2466fd46cbb117350cac65034548bc5c 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.110 2004/06/30 12:49:46 danielk1977 Exp $
+** $Id: util.c,v 1.111 2004/07/15 13:23:22 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -574,7 +574,7 @@ int sqlite3StrICmp(const char *zLeft, const char *zRight){
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
-  return *a - *b;
+  return UpperToLower[*a] - UpperToLower[*b];
 }
 int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){
   register unsigned char *a, *b;