MonetDB: Aug2011 - fixing datacell compilation: declare non-expo...

[Stefan Manegold]

Changeset: 1bfa15fca733 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1bfa15fca733
Modified Files:
        sql/backends/monet5/datacell/actuator.c
        sql/backends/monet5/datacell/datacell.c
        sql/backends/monet5/datacell/emitter.c
        sql/backends/monet5/datacell/petrinet.c
        sql/backends/monet5/datacell/sensor.c
Branch: Aug2011
Log Message:

fixing datacell compilation: declare non-exported functions static

To comply with our new strict compiler settings,
functions that are not exported, i.e., only used locally,
must be declared "static".


diffs (123 lines):

diff --git a/sql/backends/monet5/datacell/actuator.c 
b/sql/backends/monet5/datacell/actuator.c
--- a/sql/backends/monet5/datacell/actuator.c
+++ b/sql/backends/monet5/datacell/actuator.c
@@ -82,7 +82,7 @@
 #define PASSIVE 2
 static int mode = PASSIVE;
 
-void
+static void
 usage(void)
 {
        mnstr_printf(ACout, "The actuator tool can be used to catch an event 
sequence \n");
@@ -131,7 +131,7 @@
  * generated by the sensor and you get a good impression
  * of batch effect.
  */
-void showStatistics(void)
+static void showStatistics(void)
 {
        double elaps;
        int tuplesIntheBuffer = 2222;
@@ -159,7 +159,7 @@
        characters=0;
 }
 
-void terminate(Actuator ac)
+static void terminate(Actuator ac)
 {
 #ifdef _DEBUG_ACTUATOR_
        mnstr_printf(ACout, "about to shutdown the actuator\n");
@@ -168,7 +168,7 @@
        exit(0);
 }
 
-void stopListening(int i)
+static void stopListening(int i)
 {
        (void)i;
        signal(i, SIG_IGN);
diff --git a/sql/backends/monet5/datacell/datacell.c 
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -124,7 +124,7 @@
        return DCreceptorNew(ret,tbl,host,port);
 }
 
-str
+static str
 DCemitter(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        int *ret = (int *) getArgReference(stk,pci,0);
diff --git a/sql/backends/monet5/datacell/emitter.c 
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -101,7 +101,7 @@
        return em;
 }
 
-Emitter
+static Emitter
 EMfind(str nme)
 {
        Emitter r;
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
@@ -161,7 +161,7 @@
        return PNanalysis(cntxt,s->def);
 }
 
-str
+static str
 PNremove(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        str nme = *(str*) getArgReference(stk,pci,1);
@@ -546,7 +546,7 @@
        return MAL_SUCCEED;
 }
 
-str PNstart(int *ret)
+static str PNstart(int *ret)
 {
        int s;
 #ifdef _DEBUG_PETRINET_
diff --git a/sql/backends/monet5/datacell/sensor.c 
b/sql/backends/monet5/datacell/sensor.c
--- a/sql/backends/monet5/datacell/sensor.c
+++ b/sql/backends/monet5/datacell/sensor.c
@@ -92,7 +92,7 @@
 static int server = 0;
 
 
-void
+static void
 usage(void)
 {
        mnstr_printf(SEout, "The sensor tool can be used to generate a sequence 
of\n");
@@ -137,7 +137,7 @@
        if ((hdl = mapi_query(dbh, X)) == NULL || mapi_error(dbh) != MOK) \
                         die(dbh, hdl);
 
-void
+static void
 stopSend(int i)
 {
        (void)i;
@@ -147,7 +147,7 @@
 static void produceStream(Sensor se);
 static void produceServerStream(Sensor se);
 static void produceDataStream(Sensor se);
-lng estimateOverhead(void);
+static lng estimateOverhead(void);
 
 int main(int argc, char **argv)
 {
@@ -429,7 +429,7 @@
 
 #define L(X) (X + strlen(X))
 
-lng
+static lng
 estimateOverhead(void)
 {
        int i;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list