MonetDB: Apr2019 - Remove unused "next" field.

[Sjoerd Mullender]

Changeset: 8e6da3b7a59f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e6da3b7a59f
Modified Files:
        monetdb5/mal/mal_scenario.c
        monetdb5/mal/mal_scenario.h
        sql/backends/monet5/sql_scenario.c
Branch: Apr2019
Log Message:

Remove unused "next" field.


diffs (60 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
@@ -114,7 +114,7 @@ static struct SCENARIO scenarioRec[MAXSC
         "MALoptimizer", 0, 0,
         0, 0, 0,
         "MALengine", (MALfcn) &MALengine, 0,
-        "MALcallback", (MALfcn) &MALcallback, 0,0 },
+        "MALcallback", (MALfcn) &MALcallback, 0 },
        {"profiler","profiler",                 /* name */
         0, 0,                  /* initClient */
         0, 0,                  /* exitClient */
@@ -125,7 +125,7 @@ static struct SCENARIO scenarioRec[MAXSC
         0, 0, 0,               /* optimizer */
         0, 0, 0,               /* scheduler */
         0, 0, 0,               /* callback */
-        0, 0, 0,0              /* engine */
+        0, 0, 0                /* engine */
         },
        {0, 0,          /* name */
         0, 0,          /* init */
@@ -137,7 +137,7 @@ static struct SCENARIO scenarioRec[MAXSC
         0, 0, 0,               /* optimizer */
         0, 0, 0,               /* scheduler */
         0, 0, 0,               /* callback */
-        0, 0, 0, 0             /* engine */
+        0, 0, 0                /* engine */
         }
 };
 
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
@@ -58,7 +58,6 @@ typedef struct SCENARIO {
        str callback;
        MALfcn callbackCmd;
        void *callbackState;
-       struct SCENARIO *next;
 } *Scenario;
 
 mal_export str setScenario(Client c, str nme);
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
@@ -162,7 +162,6 @@ SQLprelude(Client cntxt, MalBlkPtr mb, M
                .engineCmd = SQLengine,
                .callback = "SQLcallback",
                .callbackCmd = SQLcallback,
-               .next = s->next,
        };
        ms = getFreeScenario();
        if (!ms)
@@ -187,7 +186,6 @@ SQLprelude(Client cntxt, MalBlkPtr mb, M
                .engineCmd = MALengine,
                .callback = "MALcallback",
                .callbackCmd = MALcallback,
-               .next = s->next,
        };
 
        tmp = SQLinit(cntxt);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list