Merge from NetBSD, mostly indentation

1 files changed, 51 insertions, 61 deletions

diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c
index 3e0dfc96a37..5091cbb7b02 100644
--- a/sys/dev/raidframe/rf_shutdown.c
+++ b/sys/dev/raidframe/rf_shutdown.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rf_shutdown.c,v 1.1 1999/01/11 14:29:49 niklas Exp $	*/
-/*	$NetBSD: rf_shutdown.c,v 1.1 1998/11/13 04:20:34 oster Exp $	*/
+/*	$OpenBSD: rf_shutdown.c,v 1.2 1999/02/16 00:03:26 niklas Exp $	*/
+/*	$NetBSD: rf_shutdown.c,v 1.4 1999/02/05 00:06:17 oster Exp $	*/
 /*
  * rf_shutdown.c
  */
@@ -41,74 +41,64 @@
 #include "rf_freelist.h"
 #include "rf_threadid.h"
 
-static void rf_FreeShutdownEnt(RF_ShutdownList_t *ent)
+static void 
+rf_FreeShutdownEnt(RF_ShutdownList_t * ent)
 {
-#ifdef KERNEL
-  FREE(ent, M_DEVBUF);
-#else /* KERNEL */
-  free(ent);
-#endif /* KERNEL */
+	FREE(ent, M_RAIDFRAME);
 }
 
-int _rf_ShutdownCreate(
-  RF_ShutdownList_t  **listp,
-  void               (*cleanup)(void *arg),
-  void                *arg,
-  char                *file,
-  int                  line)
+int 
+_rf_ShutdownCreate(
+    RF_ShutdownList_t ** listp,
+    void (*cleanup) (void *arg),
+    void *arg,
+    char *file,
+    int line)
 {
-  RF_ShutdownList_t *ent;
+	RF_ShutdownList_t *ent;
 
-  /*
-   * Have to directly allocate memory here, since we start up before
-   * and shutdown after RAIDframe internal allocation system.
-   */
-#ifdef KERNEL
-  ent = (RF_ShutdownList_t *)malloc( sizeof(RF_ShutdownList_t), M_DEVBUF, M_WAITOK);
-#if 0
-  MALLOC(ent, RF_ShutdownList_t *, sizeof(RF_ShutdownList_t), M_DEVBUF, M_WAITOK);
-#endif
-#else /* KERNEL */
-  ent = (RF_ShutdownList_t *)malloc(sizeof(RF_ShutdownList_t));
-#endif /* KERNEL */
-  if (ent == NULL)
-    return(ENOMEM);
-  ent->cleanup = cleanup;
-  ent->arg = arg;
-  ent->file = file;
-  ent->line = line;
-  ent->next = *listp;
-  *listp = ent;
-  return(0);
+	/*
+         * Have to directly allocate memory here, since we start up before
+         * and shutdown after RAIDframe internal allocation system.
+         */
+	ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), M_RAIDFRAME, M_WAITOK);
+	if (ent == NULL)
+		return (ENOMEM);
+	ent->cleanup = cleanup;
+	ent->arg = arg;
+	ent->file = file;
+	ent->line = line;
+	ent->next = *listp;
+	*listp = ent;
+	return (0);
 }
 
-int rf_ShutdownList(RF_ShutdownList_t **list)
+int 
+rf_ShutdownList(RF_ShutdownList_t ** list)
 {
-  RF_ShutdownList_t *r, *next;
-  char *file;
-  int line;
+	RF_ShutdownList_t *r, *next;
+	char   *file;
+	int     line;
 
-  for(r=*list;r;r=next) {
-    next = r->next;
-    file = r->file;
-    line = r->line;
+	for (r = *list; r; r = next) {
+		next = r->next;
+		file = r->file;
+		line = r->line;
 
-    if (rf_shutdownDebug) {
-      int tid;
-      rf_get_threadid(tid);
-      printf("[%d] call shutdown, created %s:%d\n", tid, file, line);
-    }
+		if (rf_shutdownDebug) {
+			int     tid;
+			rf_get_threadid(tid);
+			printf("[%d] call shutdown, created %s:%d\n", tid, file, line);
+		}
+		r->cleanup(r->arg);
 
-    r->cleanup(r->arg);
-
-    if (rf_shutdownDebug) {
-      int tid;
-      rf_get_threadid(tid);
-      printf("[%d] completed shutdown, created %s:%d\n", tid, file, line);
-    }
-
-    rf_FreeShutdownEnt(r);
-  }
-  *list = NULL;
-  return(0);
+		if (rf_shutdownDebug) {
+			int     tid;
+			rf_get_threadid(tid);
+			printf("[%d] completed shutdown, created %s:%d\n", tid, file, line);
+		}
+		rf_FreeShutdownEnt(r);
+	}
+	*list = NULL;
+	return (0);
 }