MonetDB: resource_management - Fix remaining epilogue commands.

[Sjoerd Mullender via checkin-list]

Changeset: 3f39744e3b15 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3f39744e3b15
Modified Files:
        sql/backends/monet5/UDF/pyapi3/pyapi3.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_scenario.h
        sql/backends/monet5/vaults/csv/csv.c
        sql/backends/monet5/vaults/monetdb/monetdb.c
        sql/backends/monet5/vaults/odbc/odbc_loader.c
Branch: resource_management
Log Message:

Fix remaining epilogue commands.


diffs (85 lines):

diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi3.c 
b/sql/backends/monet5/UDF/pyapi3/pyapi3.c
--- a/sql/backends/monet5/UDF/pyapi3/pyapi3.c
+++ b/sql/backends/monet5/UDF/pyapi3/pyapi3.c
@@ -887,8 +887,9 @@ PyAPI3prelude(Client cntxt, MalBlkPtr mb
 }
 
 static str
-PyAPI3epilogue(void *ret)
+PyAPI3epilogue(Client cntxt, void *ret)
 {
+       (void)cntxt;
     (void)ret;
        MT_lock_set(&pyapiLock);
        if (pyapiInitialized) {
diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -280,11 +280,12 @@ SQLexit(Client c)
 }
 
 str
-SQLepilogue(void *ret)
+SQLepilogue(Client cntxt, void *ret)
 {
        const char s[] = "sql", m[] = "msql";
        char *msg;
 
+       (void) cntxt;
        (void) ret;
        msg = SQLexit(NULL);
        freeException(msg);
diff --git a/sql/backends/monet5/sql_scenario.h 
b/sql/backends/monet5/sql_scenario.h
--- a/sql/backends/monet5/sql_scenario.h
+++ b/sql/backends/monet5/sql_scenario.h
@@ -16,7 +16,7 @@
 
 extern int SQLdebug;
 extern str SQLprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-extern str SQLepilogue(void *ret);
+extern str SQLepilogue(Client cntxt, void *ret);
 
 sql5_export str SQLautocommit(mvc *m);
 sql5_export str SQLtrans(mvc *m);
diff --git a/sql/backends/monet5/vaults/csv/csv.c 
b/sql/backends/monet5/vaults/csv/csv.c
--- a/sql/backends/monet5/vaults/csv/csv.c
+++ b/sql/backends/monet5/vaults/csv/csv.c
@@ -556,8 +556,9 @@ CSVprelude(Client cntxt, MalBlkPtr mb, M
 }
 
 static str
-CSVepilogue(void *ret)
+CSVepilogue(Client cntxt, void *ret)
 {
+       (void) cntxt;
        fl_unregister("csv");
        fl_unregister("tsv");
        fl_unregister("psv");
diff --git a/sql/backends/monet5/vaults/monetdb/monetdb.c 
b/sql/backends/monet5/vaults/monetdb/monetdb.c
--- a/sql/backends/monet5/vaults/monetdb/monetdb.c
+++ b/sql/backends/monet5/vaults/monetdb/monetdb.c
@@ -273,8 +273,9 @@ MONETDBprelude(Client cntxt, MalBlkPtr m
 }
 
 static str
-MONETDBepilogue(void *ret)
+MONETDBepilogue(Client cntxt, void *ret)
 {
+       (void) cntxt;
        pl_unregister("monetdb");
        pl_unregister("monetdbs");
        pl_unregister("mapi");
diff --git a/sql/backends/monet5/vaults/odbc/odbc_loader.c 
b/sql/backends/monet5/vaults/odbc/odbc_loader.c
--- a/sql/backends/monet5/vaults/odbc/odbc_loader.c
+++ b/sql/backends/monet5/vaults/odbc/odbc_loader.c
@@ -1449,8 +1449,9 @@ ODBCprelude(Client cntxt, MalBlkPtr mb, 
 }
 
 static str
-ODBCepilogue(void *ret)
+ODBCepilogue(Client cntxt, void *ret)
 {
+       (void) cntxt;
        (void)ret;
        pl_unregister("odbc");
        return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org