MonetDB: Jul2015 - Use type-specific getArgReference.

[Sjoerd Mullender]

Changeset: dc01e1bf1775 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc01e1bf1775
Modified Files:
        monetdb5/extras/rapi/rapi.c
        sql/backends/monet5/sql_assert.c
        sql/backends/monet5/vaults/netcdf.c
Branch: Jul2015
Log Message:

Use type-specific getArgReference.


diffs (50 lines):

diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -287,7 +287,7 @@ rapi_export str RAPIevalAggr(Client cntx
 }
 
 str RAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit 
grouped) {
-       sql_func * sqlfun = *(sql_func**) getArgReference(stk, pci, pci->retc);
+       sql_func * sqlfun = *(sql_func**) getArgReference_ptr(stk, pci, 
pci->retc);
        str exprStr = *getArgReference_str(stk, pci, pci->retc + 1);
 
        SEXP x, env, retval;
diff --git a/sql/backends/monet5/sql_assert.c b/sql/backends/monet5/sql_assert.c
--- a/sql/backends/monet5/sql_assert.c
+++ b/sql/backends/monet5/sql_assert.c
@@ -111,8 +111,8 @@ SQLassertLng(Client cntxt, MalBlkPtr mb,
 #ifdef HAVE_HGE
 str
 SQLassertHge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
-       hge *flg = (hge*) getArgReference(stk,pci, 1);
-       str *msg = (str*) getArgReference(stk,pci, 2);
+       hge *flg = getArgReference_hge(stk,pci, 1);
+       str *msg = getArgReference_str(stk,pci, 2);
        (void) cntxt;
        (void)mb;
        if (*flg){
diff --git a/sql/backends/monet5/vaults/netcdf.c 
b/sql/backends/monet5/vaults/netcdf.c
--- a/sql/backends/monet5/vaults/netcdf.c
+++ b/sql/backends/monet5/vaults/netcdf.c
@@ -222,7 +222,7 @@ NCDFattach(Client cntxt, MalBlkPtr mb, M
        sql_table *tfiles = NULL, *tdims = NULL, *tvars = NULL, *tvardim = 
NULL, *tattrs = NULL;
        sql_column *col;
        str msg = MAL_SUCCEED;
-       str fname = *(str*)getArgReference(stk, pci, 1);
+       str fname = *getArgReference_str(stk, pci, 1);
        char buf[BUFSIZ], *s= buf;
        oid fid, rid = oid_nil;
        sql_trans *tr;
@@ -618,9 +618,9 @@ NCDFimportVariable(Client cntxt, MalBlkP
        sql_table *tfiles = NULL, *arr_table = NULL;
        sql_column *col;
 
-       str msg = MAL_SUCCEED, vname = *(str*)getArgReference(stk, pci, 2);
+       str msg = MAL_SUCCEED, vname = *getArgReference_str(stk, pci, 2);
        str fname = NULL, dimtype = NULL, aname_sys = NULL;
-       int fid = *(int*)getArgReference(stk, pci, 1);
+       int fid = *getArgReference_int(stk, pci, 1);
        int varid, vndims, vnatts, i, j, retval;
        char buf[BUFSIZ], *s= buf, aname[256], **dname;
        oid rid = oid_nil;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list