MonetDB: cmake-fun - Use the right call.

[Pedro Ferreira]

Changeset: 58a90323e7f6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58a90323e7f6
Modified Files:
        monetdb5/extras/rapi/rapi.c
        sql/backends/monet5/sql_execute.c
Branch: cmake-fun
Log Message:

Use the right call.


diffs (52 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
@@ -43,7 +43,7 @@
 #endif
 
 CREATE_SQL_FUNCTION_PTR(str, SQLstatementIntern);
-CREATE_SQL_FUNCTION_PTR(void, res_table_destroy);
+CREATE_SQL_FUNCTION_PTR(void, SQLdestroyResult);
 
 /* we need the BAT-SEXP-BAT conversion in two places, here and in 
tools/embedded */
 #include "converters.c.h"
@@ -208,7 +208,7 @@ static char *RAPIinitialize(void) {
        if (e)
                return e;
 
-       LOAD_SQL_FUNCTION_PTR(res_table_destroy);
+       LOAD_SQL_FUNCTION_PTR(SQLdestroyResult);
        if (e)
                return e;
 
@@ -512,12 +512,12 @@ void* RAPIloopback(void *query) {
                                SET_STRING_ELT(names, i, 
RSTR(output->cols[i].name));
                                SET_VECTOR_ELT(retlist, i, varvalue);
                        }
-                       (*res_table_destroy_ptr)(output);
+                       (*SQLdestroyResult_ptr)(output);
                        SET_NAMES(retlist, names);
                        UNPROTECT(ncols + 2);
                        return retlist;
                }
-               (*res_table_destroy_ptr)(output);
+               (*SQLdestroyResult_ptr)(output);
        }
        return ScalarLogical(1);
 }
diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -836,8 +836,10 @@ cleanup_engine:
        return msg;
 }
 
-void SQLdestroyResult(res_table *destroy) {
-   res_table_destroy(destroy);
+void
+SQLdestroyResult(res_table *destroy)
+{
+       res_table_destroy(destroy);
 }
 
 /* a hook is provided to execute relational algebra expressions */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list