Remove the unused sqlite3Utf8to16() utility function.

FossilOrigin-Name: 9159b43eb2cb5d6ed18a5ad168fa27134fec2553

diff --git a/manifest b/manifest
index 4bba71c21f52fdb88c259c3e6030cf3e4a9c529f..c52dcb9af8cf86bd685d69859f32a08e4d038f0e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sestimating\sthe\snumber\sof\srows\sscanned\susing\sdata\sfrom\sthe\ssqlite_stat4\stable,\savoid\sallocating\sUnpackedRecord\sand\sKeyInfo\sstructures\suntil\sthey\sare\sdefinitely\srequired.
-D 2013-08-07T15:52:41.738
+C Remove\sthe\sunused\ssqlite3Utf8to16()\sutility\sfunction.
+D 2013-08-07T15:57:24.962
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/shell.c 52f975eae87c8338c4dfbf4c2842d2a0971f01fd
 F src/sqlite.h.in 442c109e0c3447c34b1794971ecdb673ce08a843
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h f56ec862ae37cf1b6e699ab5a2b53d40c8ec5068
+F src/sqliteInt.h 42adcd08a254fe14d8a369cf6381cf15e2e2e971
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -274,7 +274,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c 70061085a51f2f4fc15ece94f32c03bcb78e63b2
 F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
 F src/update.c 7d9d38e4f341ada7d79035ea969cdefb8b9014d1
-F src/utf.c acd0b6f8beb8df4e0ed178c48c81c693bcc31967
+F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
 F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
 F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
 F src/vdbe.c 91fa72a040cb1065045fce5e84196be093e29918
@@ -1106,7 +1106,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 84999e27cc0d14b89d9fe024e29d287c69285369
-R b05f226dd58169f35c18db270697f169
-U dan
-Z 7ab1efe6195a9307bc618357bb65cf2b
+P 353950a5269fa439cc3e57b62e16558a84ea2557
+R 09ec399fdfd502185b4c383f87ff6d6c
+U drh
+Z 7e0f07555c210e239e313baee1455f2b

diff --git a/manifest.uuid b/manifest.uuid
index 48fb3c47e01f132b0ed283d42a4b5335d7983c0f..cd6114b4304aa935f1a45bc1d37660744678370f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-353950a5269fa439cc3e57b62e16558a84ea2557
\ No newline at end of file
+9159b43eb2cb5d6ed18a5ad168fa27134fec2553
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d3825a597c909179a9c4b53830ae2e5044a764ea..6bda6f05fe0d0a197185291badc28019e070e89d 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3033,9 +3033,6 @@ void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8,
 void sqlite3ValueFree(sqlite3_value*);
 sqlite3_value *sqlite3ValueNew(sqlite3 *);
 char *sqlite3Utf16to8(sqlite3 *, const void*, int, u8);
-#ifdef SQLITE_ENABLE_STAT3
-char *sqlite3Utf8to16(sqlite3 *, u8, char *, int, int *);
-#endif
 int sqlite3ValueFromExpr(sqlite3 *, Expr *, u8, u8, sqlite3_value **);
 void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8);
 #ifndef SQLITE_AMALGAMATION

diff --git a/src/utf.c b/src/utf.c
index 0d67bf9133576041599f4c09a32c4afa02969b95..ecb3ea03b87a3f49622ee860490171de0aab51f3 100644 (file)
--- a/src/utf.c
+++ b/src/utf.c
@@ -450,32 +450,6 @@ char *sqlite3Utf16to8(sqlite3 *db, const void *z, int nByte, u8 enc){
   return m.z;
 }
 
-/*
-** Convert a UTF-8 string to the UTF-16 encoding specified by parameter
-** enc. A pointer to the new string is returned, and the value of *pnOut
-** is set to the length of the returned string in bytes. The call should
-** arrange to call sqlite3DbFree() on the returned pointer when it is
-** no longer required.
-** 
-** If a malloc failure occurs, NULL is returned and the db.mallocFailed
-** flag set.
-*/
-#ifdef SQLITE_ENABLE_STAT4
-char *sqlite3Utf8to16(sqlite3 *db, u8 enc, char *z, int n, int *pnOut){
-  Mem m;
-  memset(&m, 0, sizeof(m));
-  m.db = db;
-  sqlite3VdbeMemSetStr(&m, z, n, SQLITE_UTF8, SQLITE_STATIC);
-  if( sqlite3VdbeMemTranslate(&m, enc) ){
-    assert( db->mallocFailed );
-    return 0;
-  }
-  assert( m.z==m.zMalloc );
-  *pnOut = m.n;
-  return m.z;
-}
-#endif
-
 /*
 ** zIn is a UTF-16 encoded unicode string at least nChar characters long.
 ** Return the number of bytes in the first nChar unicode characters