Fix UTF conversions for -O2 on gcc 4.1.1. Ticket #2008. (CVS 3464)

FossilOrigin-Name: 86a08bb7c5da42fbeb5a026287d67912a2ffb7f1

diff --git a/manifest b/manifest
index 0185f1747aaf7031dfea3f170a0a61a1d4e121fd..2d8c7fd138a7fdccd0d8028e5456829573b83579 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tests\scases\sautomatically\sremove\smany\sof\stheir\stemporary\sfiles.\s(CVS\s3463)
-D 2006-10-04T11:55:50
+C Fix\sUTF\sconversions\sfor\s-O2\son\sgcc\s4.1.1.\s\sTicket\s#2008.\s(CVS\s3464)
+D 2006-10-04T15:23:22
 F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -110,7 +110,7 @@ F src/test_tclvar.c 315e77c17f128ff8c06b38c08617fd07c825a95b
 F src/tokenize.c dfdff21768fbedd40e8d3ca84fc5d0d7af2b46dd
 F src/trigger.c 74ccec784683232f89f3b4db34a089d8cace2058
 F src/update.c 951f95ef044cf6d28557c48dc35cb0711a0b9129
-F src/utf.c 4459801e9b00cfd69993bfca58545d3775682d6e
+F src/utf.c 297d21e9b235ea6e7c7cba639d8f3589c4d03b59
 F src/util.c 91d4cb189476906639ae611927d939691d1365f6
 F src/vacuum.c f958275b353bcc54776601582ea35ed427125a9d
 F src/vdbe.c 84a9c0b0dd037c064ffed651977e20dd9d2bc1d1
@@ -402,7 +402,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P df1a4b4834fdc88056371bcc767c5dfde2eaab72
-R 6b0934a209eee184b3bfd6d3fa874e9c
+P eef0ec0d7ae0743d29454567f539e46ad2d5008e
+R d5b9f813970a158cf400394eee3842a8
 U drh
-Z 243ef2ef54ebf101e4f5e8702fa3815b
+Z 59839b6801d726e2458ae7f941423cf8

diff --git a/manifest.uuid b/manifest.uuid
index 4d9f4052134e7175c355f18d5265c93ce788e9be..944c08480ea0f76e72736deae658e64ff5031102 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eef0ec0d7ae0743d29454567f539e46ad2d5008e
\ No newline at end of file
+86a08bb7c5da42fbeb5a026287d67912a2ffb7f1
\ No newline at end of file

diff --git a/src/utf.c b/src/utf.c
index de4ae9fcc91ba15d869deb2c8881a43c8ae11639..55a0896889852792542a9b0a61ef6edcaa03f15f 100644 (file)
--- a/src/utf.c
+++ b/src/utf.c
@@ -12,7 +12,7 @@
 ** This file contains routines used to translate between UTF-8, 
 ** UTF-16, UTF-16BE, and UTF-16LE.
 **
-** $Id: utf.c,v 1.40 2006/07/26 14:57:30 drh Exp $
+** $Id: utf.c,v 1.41 2006/10/04 15:23:22 drh Exp $
 **
 ** Notes on UTF-8:
 **
@@ -245,7 +245,7 @@ int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
   unsigned char *zIn;                   /* Input iterator */
   unsigned char *zTerm;                 /* End of input */
   unsigned char *z;                     /* Output iterator */
-  int c;
+  unsigned int c;
 
   assert( pMem->flags&MEM_Str );
   assert( pMem->enc!=desiredEnc );
@@ -475,7 +475,7 @@ char *sqlite3utf16to8(const void *z, int nByte){
 ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first).
 */
 int sqlite3utf16ByteLen(const void *zIn, int nChar){
-  int c = 1;
+  unsigned int c = 1;
   char const *z = zIn;
   int n = 0;
   if( SQLITE_UTF16NATIVE==SQLITE_UTF16BE ){
@@ -560,7 +560,7 @@ void sqlite3utfSelfTest(){
   unsigned char zBuf[20];
   unsigned char *z;
   int n;
-  int c;
+  unsigned int c;
 
   for(i=0; i<0x00110000; i++){
     z = zBuf;