From: danielk1977 <danielk1977@noemail.net>
Date: Sat, 29 May 2004 02:44:02 +0000 (+0000)
Subject: Avoid arithmetic on void pointers. (CVS 1489)
X-Git-Tag: version-3.6.10~4585
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7d00f5825ed22c50cafa59cebfba73f223311e8;p=thirdparty%2Fsqlite.git

Avoid arithmetic on void pointers. (CVS 1489)

FossilOrigin-Name: 3d68703e2e4e793012cb3c13a6744e915475e006
---

diff --git a/manifest b/manifest
index b62be5461d..7208721372 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sCREATE\sand\sDROP\sTRIGGER\son\sattached\sdatabases.\s(CVS\s1488)
-D 2004-05-29T02:37:19
+C Avoid\sarithmetic\son\svoid\spointers.\s(CVS\s1489)
+D 2004-05-29T02:44:02
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -66,7 +66,7 @@ F src/test5.c 9a1f15133f6955f067c5246e564723b5f23ff221
 F src/tokenize.c 50a87c7414de54a008427c9fed22e4e86efb6844
 F src/trigger.c 9040e5dd7e5586e863c20acdca6808e8f7bb9727
 F src/update.c 96461bcf4e946697e83c09c77c7e61b545a2f66e
-F src/utf.c d87fffc1ea7e52d73014ccea06afe1382bbb28b2
+F src/utf.c f8604999a54483533ac20a63879074f01b0df384
 F src/util.c 4df9d9b0d930d81ec581bcb68748e7c48bdc8c7d
 F src/vacuum.c 8734f89742f246abd91dbd3e087fc153bddbfbad
 F src/vdbe.c ea010d63dfdf84b7d23781144fe2cd11add2c1bd
@@ -204,7 +204,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 6661bb5f9c1692f94b8b7d900b6be07f027e6324
-R fde9d916f771cc8e55efbaa7078f8e6a
+P 4060a37d0baaa60c50f2dde4a1ab344133fcabbb
+R d21f0b4291c09165c09eb3b6a7a0c291
 U danielk1977
-Z b5bca915020b46ffea1984f7a4d9cf29
+Z 0bb4938ee61dc0247765dcbff1fe235c
diff --git a/manifest.uuid b/manifest.uuid
index f022fb6e2b..3a79c15e25 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4060a37d0baaa60c50f2dde4a1ab344133fcabbb
\ No newline at end of file
+3d68703e2e4e793012cb3c13a6744e915475e006
\ No newline at end of file
diff --git a/src/utf.c b/src/utf.c
index ff51eed514..72944c8120 100644
--- 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.13 2004/05/28 16:00:22 drh Exp $
+** $Id: utf.c,v 1.14 2004/05/29 02:44:02 danielk1977 Exp $
 **
 ** Notes on UTF-8:
 **
@@ -376,8 +376,8 @@ int sqlite3utf8CharLen(const char *pZ, int nByte){
 */
 int sqlite3utf16ByteLen(const void *pZ, int nChar){
   if( nChar<0 ){
-    const unsigned char *pC1 = pZ;
-    const unsigned char *pC2 = pZ+1;
+    const unsigned char *pC1 = (unsigned char *)pZ;
+    const unsigned char *pC2 = (unsigned char *)pZ+1;
     while( *pC1 || *pC2 ){
       pC1 += 2;
       pC2 += 2;