MonetDB: default - Restrict the scope of some variables.

[Sjoerd Mullender]

Changeset: ed2826ac806a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed2826ac806a
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/optimizer/opt_centipede.c
        tools/mserver/mserver5.c
Branch: default
Log Message:

Restrict the scope of some variables.


diffs (84 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
@@ -3021,10 +3021,7 @@ str mnstr_writeIntwrap(int *ret, Stream 
 int mnstr_write_string(Stream *S, str data);
 str mnstr_write_stringwrap(int *ret, Stream *S, str *data);
 char monet_cwd[PATHLENGTH];
-int monet_daemon;
 size_t monet_memory;
-str *monet_script;
-int monet_welcome;
 int monitorRecycler;
 int moreClients(int reruns);
 void moveInstruction(MalBlkPtr mb, int pc, int target);
@@ -3067,7 +3064,6 @@ str nextRef;
 str notRef;
 str not_uniqueRef;
 int notnilProp;
-int nrservers;
 str octopusRef;
 str oidRef;
 void oldmoveInstruction(InstrPtr dst, InstrPtr src);
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -176,11 +176,7 @@
 #include <mal.h>
 
 char monet_cwd[PATHLENGTH] = { 0 };
-int monet_welcome = 1;
-str *monet_script;
-int monet_daemon=0;
 size_t monet_memory;
-int nrservers = 0;
 
 #include "mal_stack.h"
 #include "mal_linker.h"
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -49,11 +49,7 @@
 #define DELAYUNIT 100 /* ms delay in parallel processing decissions */
 
 mal_export char     monet_cwd[PATHLENGTH];
-mal_export int      monet_welcome;
-mal_export str      *monet_script;
-mal_export int                 monet_daemon;
 mal_export size_t      monet_memory;
-mal_export int         nrservers;
 mal_export lng                 memorypool;      /* memory claimed by 
concurrent threads */
 mal_export int                 memoryclaims;    /* number of threads active 
with expensive operations */
 
diff --git a/monetdb5/optimizer/opt_centipede.c 
b/monetdb5/optimizer/opt_centipede.c
--- a/monetdb5/optimizer/opt_centipede.c
+++ b/monetdb5/optimizer/opt_centipede.c
@@ -42,6 +42,8 @@ typedef       struct{
        ValRecord bounds[MAXSITES];
 } Slices;
 
+static int nrservers;
+
 /*
  * The query will be controlled from the coordinator with a plan
  * geared at parallel execution 
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -62,6 +62,8 @@
 #endif
 
 static int malloc_init = 1;
+static int monet_daemon;
+
 /* NEEDED? */
 #if defined(_MSC_VER) && defined(__cplusplus)
 #include <eh.h>
@@ -209,6 +211,7 @@ main(int argc, char **av)
        char prmodpath[1024];
        char *modpath = NULL;
        char *binpath = NULL;
+       str *monet_script;
 
        static struct option long_options[] = {
                { "config", 1, 0, 'c' },
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list