Remove the SKIP_UTF16 macros (they are no longer in use). (CVS 4018)

FossilOrigin-Name: 73e654fbdc791daa10c49557bf479f152586ac28

diff --git a/manifest b/manifest
index 3645a4c94682c73bd89a451bc622e9605b9f5e4e..422a3ec891563817d993a243cc568758ac1149f4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\shandling\sof\sutf-16\sencoding\sof\scode\spoint\s0xE000.\s(CVS\s4017)
-D 2007-05-16T18:11:41
+C Remove\sthe\sSKIP_UTF16\smacros\s(they\sare\sno\slonger\sin\suse).\s(CVS\s4018)
+D 2007-05-16T18:23:05
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -129,7 +129,7 @@ F src/test_tclvar.c 315e77c17f128ff8c06b38c08617fd07c825a95b
 F src/tokenize.c 6cef9e6fc454d789a32c5b509ccb193a2b01977b
 F src/trigger.c 420192efe3e6f03addf7897c60c3c8bf913d3493
 F src/update.c 3359041db390a8f856d67272f299600e2104f350
-F src/utf.c 9ac9672b3552455ff910954a2dbe626d9442819e
+F src/utf.c 73134f4d3e44686ef5abd877f4fb1290b75f3311
 F src/util.c 80cdf6b68d03b8f0ab3237a390842e039cff66c6
 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
 F src/vdbe.c 51baf9ba77e986db857c69d63a979bb5227317ae
@@ -492,7 +492,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P d5db8be3680e16a74edb385dfa3730c66d5f4fd6
-R b4fd3cc8aead5f60341b0cebde166d7b
+P bfc35ce8673ce51f726535b90c1d86be272848bb
+R 092e77241dcd0659d1f09286172a9e68
 U danielk1977
-Z 1c34f7d78c7722ce1118670b27ede75c
+Z b95a4bc492b681e2a2f4517941526995

diff --git a/manifest.uuid b/manifest.uuid
index 7480c07c05c1ec06b75936f799bc2219cad63b68..6a65c31b7c29c4ad64b37fa581f454cf4a719893 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bfc35ce8673ce51f726535b90c1d86be272848bb
\ No newline at end of file
+73e654fbdc791daa10c49557bf479f152586ac28
\ No newline at end of file

diff --git a/src/utf.c b/src/utf.c
index 5a9d3dcdf9bbba3442183e3df806de0ec08c2000..14e6285a2a73fbd0e074364740cc0d1863535b6e 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.49 2007/05/16 18:11:41 danielk1977 Exp $
+** $Id: utf.c,v 1.50 2007/05/16 18:23:05 danielk1977 Exp $
 **
 ** Notes on UTF-8:
 **
@@ -126,38 +126,6 @@ const unsigned char sqlite3UtfTrans1[] = {
   }                                                                   \
 }
 
-#define SKIP_UTF16BE(zIn){                                            \
-  if( *zIn>=0xD8 && (*zIn<0xE0 || (*zIn==0xE0 && *(zIn+1)==0x00)) ){  \
-    zIn += 4;                                                         \
-  }else{                                                              \
-    zIn += 2;                                                         \
-  }                                                                   \
-}
-#define SKIP_UTF16LE(zIn){                                            \
-  zIn++;                                                              \
-  if( *zIn>=0xD8 && (*zIn<0xE0 || (*zIn==0xE0 && *(zIn-1)==0x00)) ){  \
-    zIn += 3;                                                         \
-  }else{                                                              \
-    zIn += 1;                                                         \
-  }                                                                   \
-}
-
-#define RSKIP_UTF16LE(zIn){                                            \
-  if( *zIn>=0xD8 && (*zIn<0xE0 || (*zIn==0xE0 && *(zIn-1)==0x00)) ){  \
-    zIn -= 4;                                                         \
-  }else{                                                              \
-    zIn -= 2;                                                         \
-  }                                                                   \
-}
-#define RSKIP_UTF16BE(zIn){                                            \
-  zIn--;                                                              \
-  if( *zIn>=0xD8 && (*zIn<0xE0 || (*zIn==0xE0 && *(zIn+1)==0x00)) ){  \
-    zIn -= 3;                                                         \
-  }else{                                                              \
-    zIn -= 1;                                                         \
-  }                                                                   \
-}
-
 /*
 ** If the TRANSLATE_TRACE macro is defined, the value of each Mem is
 ** printed on stderr on the way into and out of sqlite3VdbeMemTranslate().