libwp: Tidy header includes

[openafs.git] / src / lwp / threadname.c

diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c
index b56161f..8c7e055 100644 (file)
--- a/src/lwp/threadname.c
+++ b/src/lwp/threadname.c
@@ -5,7 +5,7 @@
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
- */ 
+ */
 /* ********************************************************************** */
 /*                                                                        */
 /*  trheadname.c                                                          */
@@ -19,14 +19,11 @@
 /*                                                                        */
 /* ********************************************************************** */
 
-#include <afs/param.h>
 #include <afsconfig.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+#include <afs/param.h>
+
+#include <roken.h>
+
 #if defined(AFS_PTHREAD_ENV)
 #include <pthread.h>
 #else /* defined(AFS_PTHREAD_ENV) */
@@ -39,11 +36,12 @@ int nThreads = 0;
 #if defined(AFS_PTHREAD_ENV)
 pthread_t ThreadId[MAX_THREADS];
 #else /* defined(AFS_PTHREAD_ENV) */
-PROCESS   ThreadId[MAX_THREADS];
+PROCESS ThreadId[MAX_THREADS];
 #endif /* defined(AFS_PTHREAD_ENV) */
-char      ThreadName[MAX_THREADS][MAXTHREADNAMELENGTH];
+char ThreadName[MAX_THREADS][MAXTHREADNAMELENGTH];
 
-char * threadname ()
+char *
+threadname(void)
 {
     int i;
     static char MainThread[] = "main";
@@ -56,61 +54,65 @@ char * threadname ()
 #endif /* AFS_PTHREAD_ENV */
 
 #ifdef AFS_PTHREAD_ENV
-    me =  pthread_self();
+    me = pthread_self();
 #else /* AFS_PTHREAD_ENV */
-    me =  (PROCESS) LWP_ThreadId();
+    me = (PROCESS) LWP_ThreadId();
 #endif /* AFS_PTHREAD_ENV */
-    ptr = (char *) &MainThread; 
+    ptr = &MainThread[0];
     for (i = 0; i < nThreads; i++) {
-       if (ThreadId[i] == me) {
-           ptr = (char *)&ThreadName[i];
-           break;
-       }
- }
+       if (ThreadId[i] == me) {
+           ptr = &ThreadName[i][0];
+           break;
+       }
+    }
     p = ptr;
     return p;
 }
 
-int registerthread(id, name)
+int
+registerthread(
 #ifdef AFS_PTHREAD_ENV
-    pthread_t id;
-#else /* AFS_PTHREAD_ENV */
-    PROCESS id;
-#endif /* AFS_PTHREAD_ENV */
-    char *name;
+                 pthread_t id,
+#else                          /* AFS_PTHREAD_ENV */
+                 PROCESS id,
+#endif                         /* AFS_PTHREAD_ENV */
+                 char *name)
 {
     int i;
 
     for (i = 0; i < nThreads; i++) {
-       if (ThreadId[i] == id) {
-           strncpy(&ThreadName[i][0], name, MAXTHREADNAMELENGTH);
-           return;
-       }
+       if (ThreadId[i] == id) {
+           strncpy(&ThreadName[i][0], name, MAXTHREADNAMELENGTH);
+           return 0;
+       }
     }
-    if (nThreads == MAX_THREADS) return;
+    if (nThreads == MAX_THREADS)
+       return 0;
     ThreadId[nThreads] = id;
     strncpy(&ThreadName[nThreads][0], name, MAXTHREADNAMELENGTH);
-    ThreadName[nThreads][MAXTHREADNAMELENGTH -1] =0;
+    ThreadName[nThreads][MAXTHREADNAMELENGTH - 1] = 0;
     nThreads++;
+
+    return 0;
 }
 
-int swapthreadname(id, new, old)
+int
+swapthreadname(
 #ifdef AFS_PTHREAD_ENV
-    pthread_t id;
-#else /* AFS_PTHREAD_ENV */
-    PROCESS id;
-#endif /* AFS_PTHREAD_ENV */
-    char *new;
-    char *old;
+                 pthread_t id,
+#else                          /* AFS_PTHREAD_ENV */
+                 PROCESS id,
+#endif                         /* AFS_PTHREAD_ENV */
+                 char *new, char *old)
 {
     int i;
 
     for (i = 0; i < nThreads; i++) {
-        if (ThreadId[i] == id) {
-           if (old)
-                strncpy(old, &ThreadName[i][0], MAXTHREADNAMELENGTH);
-            strncpy(&ThreadName[i][0], new, MAXTHREADNAMELENGTH);
-            return 0;
+       if (ThreadId[i] == id) {
+           if (old)
+               strncpy(old, &ThreadName[i][0], MAXTHREADNAMELENGTH);
+           strncpy(&ThreadName[i][0], new, MAXTHREADNAMELENGTH);
+           return 0;
        }
     }
     return 1;