Changeset: 50f1f6ca2f5c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50f1f6ca2f5c
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
Branch: resultset
Log Message:
Silence compilers
diffs (107 lines):
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
@@ -3082,11 +3082,12 @@ mvc_import_table_wrap(Client cntxt, MalB
unsigned char **R = (unsigned char **) getArgReference(stk, pci,
pci->retc + 3);
unsigned char **S = (unsigned char **) getArgReference(stk, pci,
pci->retc + 4);
unsigned char **N = (unsigned char **) getArgReference(stk, pci,
pci->retc + 5);
- str *fname = getArgReference_str(stk, pci, pci->retc + 6), msg;
+ str *fname = getArgReference_str(stk, pci, pci->retc + 6);
lng *sz = getArgReference_lng(stk, pci, pci->retc + 7);
lng *offset = getArgReference_lng(stk, pci, pci->retc + 8);
int *locked = getArgReference_int(stk, pci, pci->retc + 9);
int *besteffort = getArgReference_int(stk, pci, pci->retc + 10);
+ str msg = MAL_SUCCEED;
bstream *s = NULL;
stream *ss;
str utf8 = "UTF-8";
@@ -3130,7 +3131,7 @@ mvc_import_table_wrap(Client cntxt, MalB
if (!*fname || strcmp(str_nil, *(char **) fname) == 0)
fname = NULL;
if (!fname) {
- b = mvc_import_table(cntxt, be->mvc, be->mvc->scanner.rs,
*sname, *tname, (char *) tsep, (char *) rsep, (char *) ssep, (char *) ns, *sz,
*offset, *locked, *besteffort);
+ msg = mvc_import_table(cntxt, &b, be->mvc, be->mvc->scanner.rs,
*sname, *tname, (char *) tsep, (char *) rsep, (char *) ssep, (char *) ns, *sz,
*offset, *locked, *besteffort);
} else {
/* convert UTF-8 encoded file name to the character set of our
* own locale before passing it on to the system call */
@@ -3175,7 +3176,7 @@ mvc_import_table_wrap(Client cntxt, MalB
fix_windows_newline(ssep);
#endif
if (s != NULL) {
- b = mvc_import_table(cntxt, be->mvc, s, *sname, *tname,
(char *) tsep, (char *) rsep, (char *) ssep, (char *) ns, *sz, *offset,
*locked, *besteffort);
+ msg = mvc_import_table(cntxt, &b, be->mvc, s, *sname,
*tname, (char *) tsep, (char *) rsep, (char *) ssep, (char *) ns, *sz, *offset,
*locked, *besteffort);
bstream_destroy(s);
}
GDKfree(filename);
@@ -3191,7 +3192,7 @@ mvc_import_table_wrap(Client cntxt, MalB
throw(SQL, "importTable", "Failed to import table %s",
be->mvc->errstr? be->mvc->errstr:"");
bat2return(stk, pci, b);
GDKfree(b);
- return MAL_SUCCEED;
+ return msg;
}
/* str mvc_bin_import_table_wrap(.., str *sname, str *tname, str *fname..);
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -680,8 +680,8 @@ has_whitespace(const char *s)
return 0;
}
-BAT **
-mvc_import_table(Client cntxt, mvc *m, bstream *bs, char *sname, char *tname,
char *sep, char *rsep, char *ssep, char *ns, lng sz, lng offset, int locked,
int best)
+str
+mvc_import_table(Client cntxt, BAT ***bats, mvc *m, bstream *bs, char *sname,
char *tname, char *sep, char *rsep, char *ssep, char *ns, lng sz, lng offset,
int locked, int best)
{
int i = 0;
sql_schema *s = mvc_bind_schema(m, sname);
@@ -690,7 +690,6 @@ mvc_import_table(Client cntxt, mvc *m, b
Tablet as;
Column *fmt;
BUN cnt = 0;
- BAT **bats = NULL;
str msg = MAL_SUCCEED;
if (!t) {
@@ -794,15 +793,15 @@ mvc_import_table(Client cntxt, mvc *m, b
if ( (locked || (msg = TABLETcreate_bats(&as, (BUN) (sz < 0 ?
1000 : sz))) == MAL_SUCCEED) ){
if (SQLload_file(cntxt, &as, bs, out, sep, rsep, ssep ?
ssep[0] : 0, offset, sz, best) != BUN_NONE &&
(best || !as.error)) {
- bats = (BAT**) GDKzalloc(sizeof(BAT *) *
as.nr_attrs);
- if ( bats == NULL){
+ *bats = (BAT**) GDKzalloc(sizeof(BAT *) *
as.nr_attrs);
+ if ( *bats == NULL){
TABLETdestroy_format(&as);
return NULL;
}
if (locked)
- msg = TABLETcollect_parts(bats,&as,
cnt);
+ msg = TABLETcollect_parts(*bats,&as,
cnt);
else
- msg = TABLETcollect(bats,&as);
+ msg = TABLETcollect(*bats,&as);
} else if (locked) { /* restore old counts */
for (n = t->columns.set->h, i = 0; n; n =
n->next, i++) {
sql_column *col = n->data;
@@ -844,7 +843,7 @@ mvc_import_table(Client cntxt, mvc *m, b
}
TABLETdestroy_format(&as);
}
- return bats;
+ return msg;
}
/*
diff --git a/sql/backends/monet5/sql_result.h b/sql/backends/monet5/sql_result.h
--- a/sql/backends/monet5/sql_result.h
+++ b/sql/backends/monet5/sql_result.h
@@ -37,7 +37,7 @@ extern int mvc_export_chunk(backend *b,
extern int mvc_export_prepare(mvc *c, stream *s, cq *q, str w);
-extern BAT **mvc_import_table(Client cntxt, mvc *c, bstream *s, char *sname,
char *tname, char *sep, char *rsep, char *ssep, char *ns, lng nr, lng offset,
int locked, int best);
+extern str mvc_import_table(Client cntxt, BAT ***bats, mvc *c, bstream *s,
char *sname, char *tname, char *sep, char *rsep, char *ssep, char *ns, lng nr,
lng offset, int locked, int best);
extern int mvc_result_table(mvc *m, int nr_cols, int type, BAT *order);
extern int mvc_result_column(mvc *m, char *tn, char *name, char *typename, int
digits, int scale, BAT *b);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
