Fix a C++-ism in the previous change to tclsqlite.c. (CVS 2168)

FossilOrigin-Name: b49b8fdd11a5a4aac15ceda58a28bbc852f6f239

diff --git a/manifest b/manifest
index 22ad4db79028c8754430584a0bd567853a5b4280..787d64ae2615acae0278f5d08972d3903eda8f64 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s'copy'\smethod\sfor\stcl\sinterface.\s\sBehaves\ssimilar\sto\sshell\s.import\sor\sCOPY\sstatment\sin\s2.x.\s(CVS\s2167)
-D 2004-12-17T15:41:12
+C Fix\sa\sC++-ism\sin\sthe\sprevious\schange\sto\stclsqlite.c.\s(CVS\s2168)
+D 2004-12-17T20:48:06
 F Makefile.in da09f379b80c8cd78d78abaa0f32ca90a124e884
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -64,7 +64,7 @@ F src/shell.c e8f4f486cbf6e60d81173146ac8a6522c930fa51
 F src/sqlite.h.in fa75850f412808afd38fddc1fd6456f4efc6fb97
 F src/sqliteInt.h e0c5c1af95e975645c7a09b151af258d6fca1c53
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
-F src/tclsqlite.c b2b53e9dfbd0407fbfcd43cff4f34bdd2115c19a
+F src/tclsqlite.c 3a4044ef609565c8cc51e887d8b96933ba9f3b5c
 F src/test1.c b7d94c54e58f95452387a5cabdf98b2be8059f29
 F src/test2.c b11fa244fff02190707dd0879987c37c75e61fc8
 F src/test3.c 6f1ec93e13632a004b527049535079eda84c459d
@@ -263,7 +263,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P ece0085f86bd715c95a6c59f41b4a97de2555faf
-R a2db8614c6f9e04b98748c322906c74d
-U tpoindex
-Z 8ba5c26a738ea01e3fbfd3f148568092
+P a9311d9df054a91e231d4e4332df0d661675744d
+R 82afa2ad55f8fa2d63a8a18ec3035e8e
+U drh
+Z 1ee374478d3894044f0834b2bb0bd546

diff --git a/manifest.uuid b/manifest.uuid
index 07c2ae3735b4a24422e0feb24ab1dc60ed12edd4..b4fa3d69e1e74673431a1625aa5b1234a4392305 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9311d9df054a91e231d4e4332df0d661675744d
\ No newline at end of file
+b49b8fdd11a5a4aac15ceda58a28bbc852f6f239
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 83d4a63961da073690cbf784ee837f623d099fe3..d94bb1d1e0668f68dbe21bbf74eb55ebbb3a0573 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.110 2004/12/17 15:41:12 tpoindex Exp $
+** $Id: tclsqlite.c,v 1.111 2004/12/17 20:48:06 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -1111,22 +1111,6 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
   **   $db copy $conflit_algo $table_name $filename \t \\N
   */
   case DB_COPY: {
-    char *zSep;
-    char *zNull;
-    if( objc<5 || objc>7 ){
-      Tcl_WrongNumArgs(interp, 2, objv, "CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?");
-      return TCL_ERROR;
-    }
-    if( objc>=6 ){
-      zSep = Tcl_GetStringFromObj(objv[5], 0);
-    }else{
-      zSep = "\t";
-    }
-    if( objc>=7 ){
-      zNull = Tcl_GetStringFromObj(objv[6], 0);
-    }else{
-      zNull = "";
-    }
     char *zTable;               /* Insert data into this table */
     char *zFile;                /* The file from which to extract data */
     char *zConflict;            /* The conflict algorithm to use */
@@ -1146,6 +1130,23 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     char zLineNum[80];          /* Line number print buffer */
     Tcl_Obj *pResult;           /* interp result */
 
+    char *zSep;
+    char *zNull;
+    if( objc<5 || objc>7 ){
+      Tcl_WrongNumArgs(interp, 2, objv, 
+         "CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?");
+      return TCL_ERROR;
+    }
+    if( objc>=6 ){
+      zSep = Tcl_GetStringFromObj(objv[5], 0);
+    }else{
+      zSep = "\t";
+    }
+    if( objc>=7 ){
+      zNull = Tcl_GetStringFromObj(objv[6], 0);
+    }else{
+      zNull = "";
+    }
     zConflict = Tcl_GetStringFromObj(objv[2], 0);
     zTable = Tcl_GetStringFromObj(objv[3], 0);
     zFile = Tcl_GetStringFromObj(objv[4], 0);
@@ -1160,7 +1161,9 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
        sqlite3StrICmp(zConflict, "fail"    ) != 0 &&
        sqlite3StrICmp(zConflict, "ignore"  ) != 0 &&
        sqlite3StrICmp(zConflict, "replace" ) != 0 ) {
-      Tcl_AppendResult(interp, "Error: \"", zConflict, "\", conflict-algorithm must be one of: rollback, abort, fail, ignore, or replace", 0);
+      Tcl_AppendResult(interp, "Error: \"", zConflict, 
+            "\", conflict-algorithm must be one of: rollback, "
+            "abort, fail, ignore, or replace", 0);
       return TCL_ERROR;
     }
     zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable);
@@ -1186,7 +1189,8 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
       Tcl_AppendResult(interp, "Error: can't malloc()", 0);
       return TCL_ERROR;
     }
-    sqlite3_snprintf(nByte+50, zSql, "INSERT OR %q INTO '%q' VALUES(?", zConflict, zTable);
+    sqlite3_snprintf(nByte+50, zSql, "INSERT OR %q INTO '%q' VALUES(?",
+         zConflict, zTable);
     j = strlen(zSql);
     for(i=1; i<nCol; i++){
       zSql[j++] = ',';