MonetDB: resultset - Silence compiler

[Martin Kersten]

Changeset: 6510516b00d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6510516b00d8
Modified Files:
        monetdb5/modules/mal/tablet.c
        sql/backends/monet5/sql.c
Branch: resultset
Log Message:

Silence compiler


diffs (51 lines):

diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -757,7 +757,7 @@ SQLinsert_val(READERtask *task, int col,
        char *s = task->fields[col][idx];
        char quote = task->quote;
        ptr key = 0;
-       char *err;
+       char *err = NULL;
        int ret  =0;
 
        /* include testing on the terminating null byte !! */
@@ -819,7 +819,9 @@ SQLinsert_val(READERtask *task, int col,
                BUNappend(task->cntxt->error_row, &row, FALSE);
                BUNappend(task->cntxt->error_fld, &col, FALSE);
                BUNappend(task->cntxt->error_msg, "insert failed", FALSE);
+               err = SQLload_error(task,idx);
                BUNappend(task->cntxt->error_input, err, FALSE);
+               GDKfree(err);
                task->rowerror[(int)row -1]++;
                task->errorcnt++;
                MT_lock_unset(&errorlock, "insert_val");
@@ -905,7 +907,7 @@ SQLload_file_line(READERtask *task, int 
                if (i < as->nr_attrs - 1) {
                        errline = SQLload_error(task,task->next);
                        snprintf(errmsg, BUFSIZ, "Separator missing '%s' ", 
fmt->sep);
-                       tablet_error(task,idx,i,errmsg,errline);
+                       tablet_error(task,idx, (int) i,errmsg,errline);
                        GDKfree(errline);
                        error++;
                  errors:
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3033,7 +3033,7 @@ mvc_import_table_wrap(Client cntxt, MalB
        BAT **b = NULL;
        unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
        ssize_t len = 0;
-       str filename, cs;
+       str filename = NULL, cs;
        str *sname = getArgReference_str(stk, pci, pci->retc + 0);
        str *tname = getArgReference_str(stk, pci, pci->retc + 1);
        unsigned char **T = (unsigned char **) getArgReference(stk, pci, 
pci->retc + 2);
@@ -3080,7 +3080,6 @@ mvc_import_table_wrap(Client cntxt, MalB
                GDKfree(tsep);
                GDKfree(rsep);
                GDKfree(ssep);
-               GDKfree(filename);
                throw(MAL, "sql.copy_from", MAL_MALLOC_FAIL);
        }
        GDKstrFromStr(ns, *N, len);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list