lwp-take-insque-internal-20021028

make insque/remque internal

diff --git a/src/lwp/timer.c b/src/lwp/timer.c
index 8e92f2854efa601d7dc8562babcaf76c807c61c3..067920cbacfd9b6586d962a7c179f646a1d1f309 100644 (file)
--- a/src/lwp/timer.c
+++ b/src/lwp/timer.c
@@ -29,10 +29,6 @@ RCSID("$Header$");
 #include <sys/time.h>
 #endif
 #include <stdlib.h>
-#ifdef AFS_LINUX20_ENV
-/* Should now have all the possible places for picking up insque. */
-#include <search.h>
-#endif
 
 #define _TIMER_IMPL_
 #include "timer.h"
@@ -54,9 +50,8 @@ typedef unsigned char bool;
 
 static globalInitDone = 0;
 
-#if !defined(AFS_HPUX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV)
-extern insque();
-#endif
+void openafs_insque(struct TM_Elem *, struct TM_Elem *);
+void openafs_remque(struct TM_Elem *);
 
 /* t1 = t2 - t3 */
 static void subtract(t1, t2, t3)
@@ -183,7 +178,7 @@ void TM_Insert(tlistPtr, elem)
 
     /* Special case -- infinite timeout */
     if (blocking(elem)) {
-       insque(elem, tlistPtr->Prev);
+       openafs_insque(elem, tlistPtr->Prev);
        return;
     }
 
@@ -201,7 +196,7 @@ void TM_Insert(tlistPtr, elem)
      })
 
     if (next == NULL) next = tlistPtr;
-    insque(elem, next->Prev);
+    openafs_insque(elem, next->Prev);
 }
 \f
 /*
@@ -262,7 +257,6 @@ struct TM_Elem *TM_GetEarliest(tlist)
     return (e == tlist ? NULL : e);
 }
 
-#if defined(AFS_HPUX_ENV) || defined(AFS_NT40_ENV) || defined(AFS_FBSD_ENV)
 /* This used to be in hputils.c, but it's only use is in the LWP package. */
 /*
  * Emulate the vax instructions for queue insertion and deletion, somewhat.
@@ -275,7 +269,8 @@ struct TM_Elem *TM_GetEarliest(tlist)
  * effort...
  */
 
-void insque(struct TM_Elem *elementp, struct TM_Elem *quep)
+void
+openafs_insque(struct TM_Elem *elementp, struct TM_Elem *quep)
 {
     elementp->Next = quep->Next;
     elementp->Prev = quep;
@@ -284,11 +279,10 @@ void insque(struct TM_Elem *elementp, struct TM_Elem *quep)
     quep->Next = elementp;
 }
 
-void remque(struct TM_Elem *elementp)
+void
+openafs_remque(struct TM_Elem *elementp)
 {
     elementp->Next->Prev = elementp->Prev;
     elementp->Prev->Next = elementp->Next;
-    elementp->Prev = elementp->Next = (struct TM_Elem*)0;
+    elementp->Prev = elementp->Next = NULL;
 }
-
-#endif /* AFS_HPUX_ENV || AFS_NT40_ENV || AFS_FBSD_ENV */

diff --git a/src/lwp/timer.h b/src/lwp/timer.h
index 50d560dc0878af97b03d643a21b3ad130801081c..5a1c2e51ed79a48827d4838d63336b96efc9d6f1 100644 (file)
--- a/src/lwp/timer.h
+++ b/src/lwp/timer.h
@@ -23,14 +23,13 @@ struct TM_Elem {
     char               *BackPointer;   /* filled by caller, not interpreted by package */
 };
 
-#if defined(AFS_HPUX_ENV) || defined(AFS_NT40_ENV)
-extern void insque(struct TM_Elem *elementp, struct TM_Elem *quep);
-extern void remque(struct TM_Elem *elementp);
+void openafs_insque(struct TM_Elem *elementp, struct TM_Elem *quep);
+void openafs_remque(struct TM_Elem *elementp);
 extern int TM_eql(struct timeval *t1, struct timeval *t2);
-#endif
+
 #ifndef _TIMER_IMPL_
-#define Tm_Insert(list, elem) insque(list, elem)
-#define TM_Remove(list, elem) remque(elem)
+#define Tm_Insert(list, elem) openafs_insque(list, elem)
+#define TM_Remove(list, elem) openafs_remque(elem)
 extern int TM_Rescan();
 void TM_Insert();
 extern struct TM_Elem *TM_GetExpired();