Changeset: 639755179981 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/639755179981
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
Branch: default
Log Message:
Compilation fixes
diffs (42 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
@@ -2408,7 +2408,7 @@ mvc_result_set_wrap( Client cntxt, MalBl
oid o = 0;
BATiter itertbl,iteratr,itertpe,iterdig,iterscl;
backend *be = NULL;
- BAT *b, *tbl, *atr, *tpe,*len,*scale;
+ BAT *b = NULL, *tbl = NULL, *atr = NULL, *tpe = NULL,*len = NULL,*scale
= NULL;
if ((msg = getBackendContext(cntxt, &be)) != NULL)
return msg;
@@ -2430,7 +2430,7 @@ mvc_result_set_wrap( Client cntxt, MalBl
tpe = BATdescriptor(tpeId);
len = BATdescriptor(lenId);
scale = BATdescriptor(scaleId);
- if( msg || tbl == NULL || atr == NULL || tpe == NULL || len == NULL ||
scale == NULL)
+ if (tbl == NULL || atr == NULL || tpe == NULL || len == NULL || scale
== NULL)
goto wrapup_result_set;
/* mimick the old rsColumn approach; */
itertbl = bat_iterator(tbl);
@@ -2645,7 +2645,7 @@ mvc_row_result_wrap( Client cntxt, MalBl
backend *be = NULL;
ptr v;
int mtype;
- BAT *tbl, *atr, *tpe,*len,*scale;
+ BAT *tbl = NULL, *atr = NULL, *tpe = NULL, *len = NULL, *scale = NULL;
if ((msg = getBackendContext(cntxt, &be)) != NULL)
return msg;
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
@@ -1341,7 +1341,7 @@ mvc_export_table(backend *b, stream *s,
mvc *m = b->mvc;
Tablet as;
Column *fmt;
- int i, ok;
+ int i, ok = 0;
struct time_res *tres;
int csv = (b->output_format == OFMT_CSV);
int json = (b->output_format == OFMT_JSON);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
