Correct return type on sqliteStrICmp() when argument strings differ.

Ticket #804. (CVS 1793)

FossilOrigin-Name: 296528b281025d86650cf0e4c17e75c296e03310

diff --git a/manifest b/manifest
index c13b46ffec5f600bdb85de7c1d9832fef6caf463..a69e617c1bfb82ffa2d6ced3f74ca7b6c36566af 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fold\sin\schanges\ssubmitted\sby\sthe\sPHP\sdevelopers.\s(CVS\s1742)
-D 2004-06-26T14:40:05
+C Correct\sreturn\stype\son\ssqliteStrICmp()\swhen\sargument\sstrings\sdiffer.\nTicket\s#804.\s(CVS\s1793)
+D 2004-07-15T13:08:41
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -59,7 +59,7 @@ F src/test4.c 6e3e31acfaf21d66420fc35fda5b17dc0000cc8d
 F src/tokenize.c 6676b946fd8825b67ab52140af4fdc57a70bda48
 F src/trigger.c a9927b57c865b6f3df3fb5e40c9824d722660ded
 F src/update.c bd391079138e67d09c9af34528ca4137c29242d1
-F src/util.c 122bc174f6c8c2eb6a9127d9f13c4c74f83b85e4
+F src/util.c 48f1e99803e924433477a7ccbdab35663acb621d
 F src/vacuum.c 36a19aa877c696c4ec8b78300c19f4059d2617a7
 F src/vdbe.c 0853ab9983b7adbba8c012bb8b152d8453bf8a97
 F src/vdbe.h ac987945e4dd6f987bca534c6005899f089fc270
@@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 78ced6e3092d69e7cb77c5c2acff70f3c92e6523
-R 810ffa2137b70c5c615dcdf054631757
+P a4a2570822f13ece2174438ef8f8a6175aaa4a6b
+R 11b3fc0309baf367a4705eba00f7d356
 U drh
-Z 37ce03d1801f0099c401c7f2599ca98b
+Z 234cdaf95f692135439de7fcb69939b6

diff --git a/manifest.uuid b/manifest.uuid
index 5571760b5f19fecb7ce608543ce47662bf13e467..b0b4076b842af4a39e76599b39e36c7ab8af4cb2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4a2570822f13ece2174438ef8f8a6175aaa4a6b
\ No newline at end of file
+296528b281025d86650cf0e4c17e75c296e03310
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index 16b3b46a05a7998068bfb5709e86c3c428df4a7a..53809c69e23cd3dc0b2b91c7100d86a06ed021b3 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.74 2004/02/22 17:49:34 drh Exp $
+** $Id: util.c,v 1.74.2.1 2004/07/15 13:08:41 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -504,14 +504,14 @@ int sqliteStrICmp(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 sqliteStrNICmp(const char *zLeft, const char *zRight, int N){
   register unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
-  return N<0 ? 0 : *a - *b;
+  return N<0 ? 0 : UpperToLower[*a] - UpperToLower[*b];
 }
 
 /*