Changeset: 0405644e48f3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0405644e48f3
Modified Files:
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
Branch: default
Log Message:
Turn some extern functions into static; remove unused function.
clrScenario is not used anywhere and initScenario and fillScenario
only in mal_scenario.c
diffs (77 lines):
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
@@ -142,6 +142,8 @@ struct SCENARIO scenarioRec[MAXSCEN] = {
}
};
+static str fillScenario(Client c, Scenario scen);
+
/*
* @-
* Currently each user can define a new scenario, provided we have a free slot.
@@ -177,7 +179,7 @@ getFreeScenario(void)
* malInclude also needs a scenario. To break this cycle, the system should
* call once the routine default scenario for each client first.
*/
-str
+static str
initScenario(Client c, Scenario s)
{
str l = s->language;
@@ -369,7 +371,7 @@ str getScenarioLanguage(Client c){
* All client records should be initialized with a default
* scenario, i.e. the first described in the scenario table.
*/
-str
+static str
fillScenario(Client c, Scenario scen)
{
c->scenario = scen->name;
@@ -391,28 +393,6 @@ fillScenario(Client c, Scenario scen)
return(MAL_SUCCEED);
}
-void
-clrScenario(Client c)
-{
- if (c->scenario == 0)
- return;
- c->scenario = 0;
- c->phase[MAL_SCENARIO_READER] = 0;
- c->phase[MAL_SCENARIO_PARSER] = 0;
- c->phase[MAL_SCENARIO_OPTIMIZE] = 0;
- c->phase[MAL_SCENARIO_SCHEDULER] = 0;
- c->phase[MAL_SCENARIO_ENGINE] = 0;
- c->phase[MAL_SCENARIO_INITCLIENT] = 0;
- c->phase[MAL_SCENARIO_EXITCLIENT] = 0;
- c->state[MAL_SCENARIO_READER] = 0;
- c->state[MAL_SCENARIO_PARSER] = 0;
- c->state[MAL_SCENARIO_OPTIMIZE] = 0;
- c->state[MAL_SCENARIO_SCHEDULER] = 0;
- c->state[MAL_SCENARIO_ENGINE] = 0;
- c->state[MAL_SCENARIO_INITCLIENT] = 0;
- c->state[MAL_SCENARIO_EXITCLIENT] = 0;
-}
-
/*
* @-
* Setting a new scenario calls for saving the previous state
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
@@ -71,14 +71,11 @@ typedef struct SCENARIO {
mal_export str setScenario(Client c, str nme);
mal_export str runScenario(Client c);
-mal_export str fillScenario(Client c, Scenario scen);
-mal_export void clrScenario(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 str initScenario(Client c, Scenario s);
mal_export void showCurrentScenario(void);
mal_export void showScenarioByName(stream *f, str s);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
