* Examples/ex13.c: Make local functions static.

* ecmutex.c: Likewise. 
* Examples/ex14.c: Likewise.
	* Examples/ex2.c: Make local functions static; reformat.
	* Examples/ex1.c: Likewise.
	* Examples/ex4.c: Likewise.
	* Examples/ex5.c: Likewise.
	* Examples/ex7.c: Likewise.

CVS ----------------------------------------------------------------------

1 files changed, 60 insertions, 49 deletions

diff --git a/linuxthreads/Examples/ex2.c b/linuxthreads/Examples/ex2.c
index 70cb6b3986..f2556a4206 100644
--- a/linuxthreads/Examples/ex2.c
+++ b/linuxthreads/Examples/ex2.c
@@ -10,61 +10,66 @@
 
 /* Circular buffer of integers. */
 
-struct prodcons {
-  int buffer[BUFFER_SIZE];      /* the actual data */
-  pthread_mutex_t lock;         /* mutex ensuring exclusive access to buffer */
-  int readpos, writepos;        /* positions for reading and writing */
-  pthread_cond_t notempty;      /* signaled when buffer is not empty */
-  pthread_cond_t notfull;       /* signaled when buffer is not full */
+struct prodcons
+{
+  int buffer[BUFFER_SIZE];	/* the actual data */
+  pthread_mutex_t lock;		/* mutex ensuring exclusive access to buffer */
+  int readpos, writepos;	/* positions for reading and writing */
+  pthread_cond_t notempty;	/* signaled when buffer is not empty */
+  pthread_cond_t notfull;	/* signaled when buffer is not full */
 };
 
 /* Initialize a buffer */
-
-void init(struct prodcons * b)
+static void
+init (struct prodcons *b)
 {
-  pthread_mutex_init(&b->lock, NULL);
-  pthread_cond_init(&b->notempty, NULL);
-  pthread_cond_init(&b->notfull, NULL);
+  pthread_mutex_init (&b->lock, NULL);
+  pthread_cond_init (&b->notempty, NULL);
+  pthread_cond_init (&b->notfull, NULL);
   b->readpos = 0;
   b->writepos = 0;
 }
 
 /* Store an integer in the buffer */
-
-void put(struct prodcons * b, int data)
+static void
+put (struct prodcons *b, int data)
 {
-  pthread_mutex_lock(&b->lock);
+  pthread_mutex_lock (&b->lock);
   /* Wait until buffer is not full */
-  while ((b->writepos + 1) % BUFFER_SIZE == b->readpos) {
-    pthread_cond_wait(&b->notfull, &b->lock);
-    /* pthread_cond_wait reacquired b->lock before returning */
-  }
+  while ((b->writepos + 1) % BUFFER_SIZE == b->readpos)
+    {
+      pthread_cond_wait (&b->notfull, &b->lock);
+      /* pthread_cond_wait reacquired b->lock before returning */
+    }
   /* Write the data and advance write pointer */
   b->buffer[b->writepos] = data;
   b->writepos++;
-  if (b->writepos >= BUFFER_SIZE) b->writepos = 0;
+  if (b->writepos >= BUFFER_SIZE)
+    b->writepos = 0;
   /* Signal that the buffer is now not empty */
-  pthread_cond_signal(&b->notempty);
-  pthread_mutex_unlock(&b->lock);
+  pthread_cond_signal (&b->notempty);
+  pthread_mutex_unlock (&b->lock);
 }
 
 /* Read and remove an integer from the buffer */
-
-int get(struct prodcons * b)
+static int
+get (struct prodcons *b)
 {
   int data;
-  pthread_mutex_lock(&b->lock);
+  pthread_mutex_lock (&b->lock);
   /* Wait until buffer is not empty */
-  while (b->writepos == b->readpos) {
-    pthread_cond_wait(&b->notempty, &b->lock);
-  }
+  while (b->writepos == b->readpos)
+    {
+      pthread_cond_wait (&b->notempty, &b->lock);
+    }
   /* Read the data and advance read pointer */
   data = b->buffer[b->readpos];
   b->readpos++;
-  if (b->readpos >= BUFFER_SIZE) b->readpos = 0;
+  if (b->readpos >= BUFFER_SIZE)
+    b->readpos = 0;
   /* Signal that the buffer is now not full */
-  pthread_cond_signal(&b->notfull);
-  pthread_mutex_unlock(&b->lock);
+  pthread_cond_signal (&b->notfull);
+  pthread_mutex_unlock (&b->lock);
   return data;
 }
 
@@ -75,39 +80,45 @@ int get(struct prodcons * b)
 
 struct prodcons buffer;
 
-void * producer(void * data)
+static void *
+producer (void *data)
 {
   int n;
-  for (n = 0; n < 10000; n++) {
-    printf("%d --->\n", n);
-    put(&buffer, n);
-  }
-  put(&buffer, OVER);
+  for (n = 0; n < 10000; n++)
+    {
+      printf ("%d --->\n", n);
+      put (&buffer, n);
+    }
+  put (&buffer, OVER);
   return NULL;
 }
 
-void * consumer(void * data)
+static void *
+consumer (void *data)
 {
   int d;
-  while (1) {
-    d = get(&buffer);
-    if (d == OVER) break;
-    printf("---> %d\n", d);
-  }
+  while (1)
+    {
+      d = get (&buffer);
+      if (d == OVER)
+	break;
+      printf ("---> %d\n", d);
+    }
   return NULL;
 }
 
-int main(void)
+int
+main (void)
 {
   pthread_t th_a, th_b;
-  void * retval;
+  void *retval;
 
-  init(&buffer);
+  init (&buffer);
   /* Create the threads */
-  pthread_create(&th_a, NULL, producer, 0);
-  pthread_create(&th_b, NULL, consumer, 0);
+  pthread_create (&th_a, NULL, producer, 0);
+  pthread_create (&th_b, NULL, consumer, 0);
   /* Wait until producer and consumer finish. */
-  pthread_join(th_a, &retval);
-  pthread_join(th_b, &retval);
+  pthread_join (th_a, &retval);
+  pthread_join (th_b, &retval);
   return 0;
 }