Changeset: c4a3e65c31e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4a3e65c31e7
Modified Files:
monetdb5/extras/rapi/converters.h
tools/embedded/embedded.c
Branch: embedded
Log Message:
compilation fixes
diffs (40 lines):
diff --git a/monetdb5/extras/rapi/converters.h
b/monetdb5/extras/rapi/converters.h
--- a/monetdb5/extras/rapi/converters.h
+++ b/monetdb5/extras/rapi/converters.h
@@ -51,7 +51,7 @@
#define SXP_TO_BAT(tpe,access_fun,na_check)
\
do {
\
- tpe *p, prev = tpe##_nil;
\
+ tpe *p, prev = tpe##_nil; int i,j;
\
b = BATnew(TYPE_void, TYPE_##tpe, cnt, TRANSIENT);
\
BATseqbase(b, 0); b->T->nil = 0; b->T->nonil = 1; b->tkey = 0;
\
b->tsorted = 1; b->trevsorted = 1;
\
@@ -119,7 +119,6 @@ static SEXP bat_to_sexp(BAT* b) {
static BAT* sexp_to_bat(SEXP s, int type) {
BAT* b;
BUN cnt = LENGTH(s);
- int i, j;
switch (type) {
case TYPE_int: {
if (!IS_INTEGER(s)) {
diff --git a/tools/embedded/embedded.c b/tools/embedded/embedded.c
--- a/tools/embedded/embedded.c
+++ b/tools/embedded/embedded.c
@@ -199,7 +199,6 @@ char* monetdb_append(const char* schema,
}
}
if (res == MAL_SUCCEED) {
-// m->emod = 16;
(*sqlcleanup_ptr)(m, 0);
}
GDKfree(mb.var);
@@ -332,7 +331,7 @@ SEXP monetdb_append_R(SEXP schemasexp, S
int bat_type = t_column_types[i];
b = sexp_to_bat(ret_col, bat_type);
if (b == NULL) {
- msg = GDKstrdup("eek");
+ msg = GDKstrdup("eek"); // TODO: better error message
here
goto wrapup;
}
ad[i].colname = t_column_names[i];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
