From ec7df33c4d953153828eb30b2565fbdf2836ce68 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 11 Jul 2005 19:59:55 +0000
Subject: [PATCH] STABLE14-lwp-protoize-20050618

protoize lwp directory


(cherry picked from commit 91953e8c0774697902ca025dd7969f0acc9c9ec2)
---
 src/lwp/lwp.c     | 15 ++++-----------
 src/lwp/preempt.c | 15 ++++-----------
 src/lwp/timer.c   | 32 +++++++++++---------------------
 3 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c
index 29c6991d9..59b87bc61 100644
--- a/src/lwp/lwp.c
+++ b/src/lwp/lwp.c
@@ -145,9 +145,7 @@ int lwp_nextindex;
 int lwp_MinStackSize = 0;
 
 static int
-lwp_remove(p, q)
-     register PROCESS p;
-     register struct QUEUE *q;
+lwp_remove(register PROCESS p, register struct QUEUE *q)
 {
     /* Special test for only element on queue */
     if (q->count == 1)
@@ -166,9 +164,7 @@ lwp_remove(p, q)
 }
 
 static int
-insert(p, q)
-     register PROCESS p;
-     register struct QUEUE *q;
+insert(register PROCESS p, register struct QUEUE *q)
 {
     if (q->head == NULL) {	/* Queue is empty */
 	q->head = p;
@@ -184,9 +180,7 @@ insert(p, q)
 }
 
 static int
-move(p, from, to)
-     PROCESS p;
-     struct QUEUE *from, *to;
+move(PROCESS p, struct QUEUE *from, struct QUEUE *to)
 {
 
     lwp_remove(p, from);
@@ -248,8 +242,7 @@ LWP_QWait(void)
 }
 
 int
-LWP_QSignal(pid)
-     register PROCESS pid;
+LWP_QSignal(register PROCESS pid)
 {
     if (pid->status == QWAITING) {
 	pid->status = READY;
diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c
index f9ed1991b..1e63e05e3 100644
--- a/src/lwp/preempt.c
+++ b/src/lwp/preempt.c
@@ -28,8 +28,7 @@ int PRE_Block = 0;
 
 
 int
-PRE_InitPreempt(slice)
-     struct timeval *slice;
+PRE_InitPreempt(struct timeval *slice)
 {
     return LWP_SUCCESS;
 }
@@ -55,15 +54,10 @@ char PRE_Block = 0;		/* used in lwp.c and process.s */
 
 #if HAVE_SIGACTION && defined(SA_SIGINFO)
 static void
-AlarmHandler(sig, st, scp)
-     int sig;
-     siginfo_t *st;
-     ucontext_t *scp;
+AlarmHandler(int sig, siginfo_t *st, ucontext_t *scp)
 #else
 static void
-AlarmHandler(sig, code, scp)
-     int sig, code;
-     struct sigcontext *scp;
+AlarmHandler(int sig, int code, struct sigcontext *scp)
 #endif
 {
     if (PRE_Block == 0 && lwp_cpptr->level == 0) {
@@ -80,8 +74,7 @@ AlarmHandler(sig, code, scp)
 }
 
 int
-PRE_InitPreempt(slice)
-     struct timeval *slice;
+PRE_InitPreempt(struct timeval *slice)
 {
     struct itimerval itv;
 #if HAVE_SIGACTION && defined(SA_SIGINFO)
diff --git a/src/lwp/timer.c b/src/lwp/timer.c
index a8adc208a..cdc2285eb 100644
--- a/src/lwp/timer.c
+++ b/src/lwp/timer.c
@@ -53,8 +53,8 @@ static int globalInitDone = 0;
 
 /* t1 = t2 - t3 */
 static void
-subtract(t1, t2, t3)
-     register struct timeval *t1, *t2, *t3;
+subtract(register struct timeval *t1, register struct timeval *t2, 
+	 register struct timeval *t3)
 {
     register int sec2, usec2, sec3, usec3;
 
@@ -86,8 +86,7 @@ subtract(t1, t2, t3)
 /* t1 += t2; */
 
 static void
-add(t1, t2)
-     register struct timeval *t1, *t2;
+add(register struct timeval *t1, register struct timeval *t2)
 {
     t1->tv_usec += t2->tv_usec;
     t1->tv_sec += t2->tv_sec;
@@ -109,8 +108,7 @@ TM_eql(struct timeval *t1, struct timeval *t2)
 
 /*
 obsolete, commentless procedure, all done by hand expansion now.
-static bool geq(t1, t2)
-    register struct timeval *t1, *t2;
+static bool geq(register struct timeval *t1, register struct timeval *t2)
 {
     return (t1->tv_sec > t2->tv_sec) ||
 	   (t1->tv_sec == t2->tv_sec && t1->tv_usec >= t2->tv_usec);
@@ -118,8 +116,7 @@ static bool geq(t1, t2)
 */
 
 static bool
-blocking(t)
-     register struct TM_Elem *t;
+blocking(register struct TM_Elem *t)
 {
     return (t->TotalTime.tv_sec < 0 || t->TotalTime.tv_usec < 0);
 }
@@ -131,8 +128,7 @@ blocking(t)
 */
 
 int
-TM_Init(list)
-     register struct TM_Elem **list;
+TM_Init(register struct TM_Elem **list)
 {
     if (!globalInitDone) {
 	FT_Init(0, 0);
@@ -155,8 +151,7 @@ TM_Init(list)
 }
 
 int
-TM_Final(list)
-     register struct TM_Elem **list;
+TM_Final(register struct TM_Elem **list)
 {
     if (list == NULL || *list == NULL)
 	return -1;
@@ -172,9 +167,7 @@ TM_Final(list)
 */
 
 void
-TM_Insert(tlistPtr, elem)
-     struct TM_Elem *tlistPtr;	/* pointer to head pointer of timer list */
-     struct TM_Elem *elem;	/* element to be inserted */
+TM_Insert(struct TM_Elem *tlistPtr, struct TM_Elem *elem)
 {
     register struct TM_Elem *next;
 
@@ -214,8 +207,7 @@ TM_Insert(tlistPtr, elem)
 */
 
 int
-TM_Rescan(tlist)
-     struct TM_Elem *tlist;	/* head pointer of timer list */
+TM_Rescan(struct TM_Elem *tlist)	/* head pointer of timer list */
 {
     struct timeval time;
     register int expired;
@@ -243,8 +235,7 @@ TM_Rescan(tlist)
 */
 
 struct TM_Elem *
-TM_GetExpired(tlist)
-     struct TM_Elem *tlist;	/* head pointer of timer list */
+TM_GetExpired(struct TM_Elem *tlist)	/* head pointer of timer list */
 {
     FOR_ALL_ELTS(e, tlist, {
 		 if (!blocking(e)
@@ -263,8 +254,7 @@ TM_GetExpired(tlist)
 */
 
 struct TM_Elem *
-TM_GetEarliest(tlist)
-     struct TM_Elem *tlist;
+TM_GetEarliest(struct TM_Elem *tlist)
 {
     register struct TM_Elem *e;
 
-- 
2.39.5