Changeset: 54442fdf7d93 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/54442fdf7d93
Modified Files:
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
Branch: Jun2023
Log Message:
Remove some unnecessary casts and fix one bad one.
diffs (67 lines):
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -173,9 +173,9 @@ OPTwrapper(Client cntxt, MalBlkPtr mb, M
str
OPTstatistics(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
- bat *nme = (bat*) getArgReference_bat(stk, p, 0);
- bat *cnt = (bat*) getArgReference_bat(stk, p, 1);
- bat *time = (bat*) getArgReference_bat(stk, p, 2);
+ bat *nme = getArgReference_bat(stk, p, 0);
+ bat *cnt = getArgReference_bat(stk, p, 1);
+ bat *time = getArgReference_bat(stk, p, 2);
BAT *n, *c, *t;
int i;
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -510,7 +510,7 @@ static str CUDFeval(Client cntxt, MalBlk
(void)pthread_sigmask(SIG_UNBLOCK, &signal_set, NULL);
}
- sqlfun = *(sql_func **)getArgReference_ptr(stk, pci, pci->retc);
+ sqlfun = (sql_func *)*getArgReference_ptr(stk, pci, pci->retc);
funcname = sqlfun ? sqlfun->base.name : "yet_another_c_function";
args = (str *)GDKzalloc(sizeof(str) * pci->argc);
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
@@ -517,7 +517,7 @@ mvc_claim_wrap(Client cntxt, MalBlkPtr m
str msg;
const char *sname = *getArgReference_str(stk, pci, 3);
const char *tname = *getArgReference_str(stk, pci, 4);
- lng cnt = *(lng*)getArgReference_lng(stk, pci, 5);
+ lng cnt = *getArgReference_lng(stk, pci, 5);
BAT *pos = NULL;
sql_schema *s;
sql_table *t;
@@ -554,7 +554,7 @@ mvc_add_dependency_change(Client cntxt,
mvc *m = NULL;
const char *sname = *getArgReference_str(stk, pci, 1);
const char *tname = *getArgReference_str(stk, pci, 2);
- lng cnt = *(lng*)getArgReference_lng(stk, pci, 3);
+ lng cnt = *getArgReference_lng(stk, pci, 3);
sql_schema *s;
sql_table *t;
@@ -993,7 +993,7 @@ mvc_next_value_bulk(Client cntxt, MalBlk
sql_schema *s;
sql_sequence *seq;
bat *res = getArgReference_bat(stk, pci, 0);
- BUN card = *(BUN*)getArgReference_lng(stk, pci, 1);
+ BUN card = (BUN)*getArgReference_lng(stk, pci, 1);
const char *sname = *getArgReference_str(stk, pci, 2);
const char *seqname = *getArgReference_str(stk, pci, 3);
BAT *r = NULL;
@@ -1789,7 +1789,7 @@ mvc_append_wrap(Client cntxt, MalBlkPtr
const char *sname = *getArgReference_str(stk, pci, 2);
const char *tname = *getArgReference_str(stk, pci, 3);
const char *cname = *getArgReference_str(stk, pci, 4);
- BUN offset = *(BUN*)getArgReference_oid(stk, pci, 5);
+ BUN offset = (BUN)*getArgReference_oid(stk, pci, 5);
bat Pos = *getArgReference_bat(stk, pci, 6);
ptr ins = getArgReference(stk, pci, 7);
int tpe = getArgType(mb, pci, 7), log_res = LOG_OK;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
