MonetDB: default - Keep private functions/data private.

[Sjoerd Mullender]

Changeset: 16e32fe2aab7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16e32fe2aab7
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/mal/mal_box.c
        monetdb5/mal/mal_private.h
        monetdb5/mal/mal_scenario.c
        monetdb5/mal/mal_scenario.h
Branch: default
Log Message:

Keep private functions/data private.


diffs (70 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2470,7 +2470,6 @@ void debugParser(int i);
 str debugScheduler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str decompressRef;
 int defConstant(MalBlkPtr mb, int type, ValPtr cst);
-str defaultScenario(Client c);
 void delArgument(InstrPtr p, int varid);
 void delName(str nme, size_t len);
 void delVariable(MalBlkPtr mb, int varid);
@@ -2506,7 +2505,6 @@ str evalFile(Client c, str fname, int li
 str evalRef;
 str exceptionToString(enum malexception);
 str execRef;
-void exitScenario(Client c);
 void expandMacro(MalBlkPtr mb, InstrPtr p, MalBlkPtr mc);
 void expandMalBlk(MalBlkPtr mb, int lines);
 str expandRef;
diff --git a/monetdb5/mal/mal_box.c b/monetdb5/mal/mal_box.c
--- a/monetdb5/mal/mal_box.c
+++ b/monetdb5/mal/mal_box.c
@@ -212,6 +212,7 @@
 #include "mal_box.h"
 #include "mal_interpreter.h"   /* for garbageCollector() & garbageElement() */
 #include "mal_client.h"
+#include "mal_private.h"
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 #define access _access
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -21,3 +21,5 @@
 
 extern void MCexitClient(Client c);
 extern void stopMALdataflow(void);
+extern str defaultScenario(Client c);  /* used in src/mal/mal_session.c */
+extern void exitScenario(Client c);    /* used in src/mal/mal_session.c */
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -113,12 +113,13 @@
 #include "mal_client.h"
 #include "mal_authorize.h"
 #include "mal_exception.h"
+#include "mal_private.h"
 
 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
 #endif
 
-struct SCENARIO scenarioRec[MAXSCEN] = {
+static struct SCENARIO scenarioRec[MAXSCEN] = {
        {"mal", "mal",
         0, 0,                  /* hardwired MALinit*/
         0, 0,                  /* implicit */
diff --git a/monetdb5/mal/mal_scenario.h b/monetdb5/mal/mal_scenario.h
--- a/monetdb5/mal/mal_scenario.h
+++ b/monetdb5/mal/mal_scenario.h
@@ -74,9 +74,6 @@ mal_export str runScenario(Client c);
 mal_export str getScenarioLanguage(Client c);
 mal_export Scenario getFreeScenario(void);
 
-mal_export str defaultScenario(Client c);      /* used in 
src/mal/mal_session.c */
-mal_export void exitScenario(Client c);        /* used in 
src/mal/mal_session.c */
-
 mal_export void showCurrentScenario(void);
 mal_export void showScenarioByName(stream *f, str s);
 mal_export void showScenario(stream *f, Scenario s);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list