Fix some compiler warnings. Add the (untested) zeroblob() SQL function. (CVS 3895)

FossilOrigin-Name: 6f4f8ba7ec15f214f36fa78e593dd4522ab717f5

diff --git a/manifest b/manifest
index 9de3ea99eb2642613b022d461fbfeae978daa617..3b5f8ab4f64c4b65852dff31ba19c34889ad0dca 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Begin\sadding\sthe\szeroblob\sAPI\sto\ssupport\sincremental\sblob\si/o.\s(CVS\s3894)
-D 2007-05-02T01:34:31
+C Fix\ssome\scompiler\swarnings.\s\sAdd\sthe\s(untested)\szeroblob()\sSQL\sfunction.\s(CVS\s3895)
+D 2007-05-02T02:08:29
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -68,7 +68,7 @@ F src/date.c 94a6777df13d2aaacd19de080d9e8d3444364133
 F src/delete.c 5c0d89b3ef7d48fe1f5124bfe8341f982747fe29
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
 F src/expr.c 2f0f9f89efe9170e5e6ca5d5e93a9d5896fff5ac
-F src/func.c b40a6320fa12530602ffd9535c8f97f934f0e69c
+F src/func.c a4bc09fe4fdf3cbab8840ae8d8b76ca1f338de22
 F src/hash.c 67b23e14f0257b69a3e8aa663e4eeadc1a2b6fd5
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c 413cc06990cb3c401e64e596776c1e43934f8841
@@ -127,7 +127,7 @@ F src/util.c b6344325378e75b9e18175d8b6aed1723d73dad9
 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
 F src/vdbe.c 8cc851ca1d6d849586eb0c5359c492685c285c97
 F src/vdbe.h 0025259af1939fb264a545816c69e4b5b8d52691
-F src/vdbeInt.h 016c808478bce04e071c38fa506e05763e8a54b9
+F src/vdbeInt.h 10ff7c35f790d48f51317af4e5833d4d4cb5da34
 F src/vdbeapi.c 37d793559390bec8a00c556f651f21b5f9e589af
 F src/vdbeaux.c ef59545f53f90394283f2fd003375d3ebbf0bd6e
 F src/vdbeblob.c 6d3128c71d5a6b8db627ea3052ed5aaaaf26e672
@@ -470,7 +470,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 7c4c65924035d9f260f6b64eb92c5c6cf6c04b7b
-R ab7ef76e7fb4aa900cb531034d51122a
+P 7a01836dde45098796693bc6cb6045c4059adf1a
+R 05e0b3dbc6feb6e7c7aca220b80c8909
 U drh
-Z 29f62b2ce72d241a227558f749482713
+Z cffc5ba75c4a156de15690c278520f4f

diff --git a/manifest.uuid b/manifest.uuid
index d51270c01f700385472b0f197478a4dfef221fe1..4319a33ae4e7374d9aef2cda40f2749233a850e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a01836dde45098796693bc6cb6045c4059adf1a
\ No newline at end of file
+6f4f8ba7ec15f214f36fa78e593dd4522ab717f5
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index d77d5ff35124da0feb3bd30fa7d25c205f6a5287..c3279b4fe3ebacda06767605ae0063867cd93e25 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.143 2007/04/27 21:59:53 drh Exp $
+** $Id: func.c,v 1.144 2007/05/02 02:08:29 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -682,6 +682,20 @@ static void hexFunc(
   sqlite3_result_text(context, zHex, n*2, sqlite3_free);
 }
 
+/*
+** The zeroblob(N) function returns a zero-filled blob of size N bytes.
+*/
+static void zeroblobFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int n;
+  assert( argc==1 );
+  n = sqlite3_value_int(argv[0]);
+  sqlite3_result_zeroblob(context, n);
+}
+
 /*
 ** The replace() function.  Three arguments are all strings: call
 ** them A, B, and C. The result is also a string which is derived
@@ -764,10 +778,10 @@ static void trimFunc(
   if( zIn==0 ) return;
   if( argc==1 ){
     static const unsigned char lenOne[] = { 1 };
-    static const char *azOne[] = { " " };
+    static const unsigned char *azOne[] = { (u8*)" " };
     nChar = 1;
-    aLen = (unsigned char*)lenOne;
-    azChar = (const unsigned char**)azOne;
+    aLen = (u8*)lenOne;
+    azChar = azOne;
     zCharSet = 0;
   }else if( (zCharSet = sqlite3_value_text(argv[1]))==0 ){
     return;
@@ -1244,6 +1258,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
     { "rtrim",              2, 2, SQLITE_UTF8,    0, trimFunc          },
     { "trim",               1, 3, SQLITE_UTF8,    0, trimFunc          },
     { "trim",               2, 3, SQLITE_UTF8,    0, trimFunc          },
+    { "zeroblob",           1, 0, SQLITE_UTF8,    0, zeroblobFunc      },
 #ifdef SQLITE_SOUNDEX
     { "soundex",            1, 0, SQLITE_UTF8,    0, soundexFunc},
 #endif

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 88ea6c72d03bda01b1bff90dd9599cf744f034c5..f00e7b5a4048937966f0385fe6feec0567902f9f 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -387,6 +387,7 @@ void sqlite3VdbeMemSetInt64(Mem*, i64);
 void sqlite3VdbeMemSetDouble(Mem*, double);
 void sqlite3VdbeMemSetNull(Mem*);
 void sqlite3VdbeMemSetZeroBlob(Mem*,int);
+int sqlite3VdbeMemExpandBlob(Mem*);
 int sqlite3VdbeMemMakeWriteable(Mem*);
 int sqlite3VdbeMemDynamicify(Mem*);
 int sqlite3VdbeMemStringify(Mem*, int);