MonetDB: Oct2014 - Fix calling sequence of SQLinitEnvironment.

[Sjoerd Mullender]

Changeset: 46c64884f6cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46c64884f6cb
Modified Files:
        sql/backends/monet5/datacell/petrinet.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_scenario.h
Branch: Oct2014
Log Message:

Fix calling sequence of SQLinitEnvironment.


diffs (49 lines):

diff --git a/sql/backends/monet5/datacell/petrinet.c 
b/sql/backends/monet5/datacell/petrinet.c
--- a/sql/backends/monet5/datacell/petrinet.c
+++ b/sql/backends/monet5/datacell/petrinet.c
@@ -474,7 +474,7 @@ PNcontroller(void *dummy)
 
        cntxt = mal_clients; /* run as admin in SQL mode*/
         if( strcmp(cntxt->scenario, "sql") )
-               SQLinitEnvironment(cntxt);
+                SQLinitEnvironment(cntxt, NULL, NULL, NULL);
        /* At this point we know what is the total number of factories.
         * The most extremely case is when ALL factories are enable to fire
         * so the maximum space we could ever need is = #factories (=pnettop)*/
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
@@ -1320,8 +1320,11 @@ SQLexitClient(Client c)
  * execution
  */
 str
-SQLinitEnvironment(Client cntxt)
+SQLinitEnvironment(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
+       (void) mb;
+       (void) stk;
+       (void) pci;
        return SQLinitClient(cntxt);
 }
 
@@ -1371,7 +1374,7 @@ SQLstatementIntern(Client c, str *expr, 
        mnstr_printf(c->fdout, "#SQLstatement:%s\n", *expr);
 #endif
        if (!sql) {
-               msg = SQLinitEnvironment(c);
+               msg = SQLinitEnvironment(c, NULL, NULL, NULL);
                sql = (backend *) c->sqlcontext;
        }
        if (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
@@ -41,7 +41,7 @@ sql5_export str SQLassertInt(Client cntx
 sql5_export str SQLassertWrd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 sql5_export str SQLassertLng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 
-sql5_export str SQLinitEnvironment(Client cntxt);
+sql5_export str SQLinitEnvironment(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 sql5_export str SQLstatement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 sql5_export str SQLstatementIntern(Client c, str *expr, str nme, int execute, 
bit output);
 sql5_export str SQLcompile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list