Run Nindent on dos/malloc.c

Automatically reformat dos/malloc.c using Nindent.

Do this for all files except HDT, gPXE and externally maintained
libraries (zlib, tinyjpeg, libpng).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 73 insertions, 74 deletions

diff --git a/dos/malloc.c b/dos/malloc.c
index 052b0a5a..3cfcbb2c 100644
--- a/dos/malloc.c
+++ b/dos/malloc.c
@@ -7,16 +7,15 @@
 #include <stdlib.h>
 #include "malloc.h"
 
-struct free_arena_header __malloc_head =
-{
-  {
-    ARENA_TYPE_HEAD,
-    0,
-    &__malloc_head,
+struct free_arena_header __malloc_head = {
+    {
+     ARENA_TYPE_HEAD,
+     0,
+     &__malloc_head,
+     &__malloc_head,
+     },
     &__malloc_head,
-  },
-  &__malloc_head,
-  &__malloc_head
+    &__malloc_head
 };
 
 /* This is extern so it can be overridden by the user application */
@@ -24,91 +23,91 @@ const size_t __stack_size = 4096;
 
 static inline size_t sp(void)
 {
-  uint32_t sp;
-  asm volatile("movl %%esp,%0" : "=rm" (sp));
-  return sp;
+    uint32_t sp;
+    asm volatile ("movl %%esp,%0":"=rm" (sp));
+    return sp;
 }
 
 extern void *__mem_end;
 
 void __init_memory_arena(void)
 {
-  struct free_arena_header *fp;
-  size_t start, total_space;
+    struct free_arena_header *fp;
+    size_t start, total_space;
 
-  start = (size_t)ARENA_ALIGN_UP(__mem_end);
-  total_space = sp() - start;
+    start = (size_t) ARENA_ALIGN_UP(__mem_end);
+    total_space = sp() - start;
 
-  fp = (struct free_arena_header *)start;
-  fp->a.type = ARENA_TYPE_FREE;
-  fp->a.size = total_space - __stack_size;
+    fp = (struct free_arena_header *)start;
+    fp->a.type = ARENA_TYPE_FREE;
+    fp->a.size = total_space - __stack_size;
 
-  /* Insert into chains */
-  fp->a.next = fp->a.prev = &__malloc_head;
-  fp->next_free = fp->prev_free = &__malloc_head;
-  __malloc_head.a.next = __malloc_head.a.prev = fp;
-  __malloc_head.next_free = __malloc_head.prev_free = fp;
+    /* Insert into chains */
+    fp->a.next = fp->a.prev = &__malloc_head;
+    fp->next_free = fp->prev_free = &__malloc_head;
+    __malloc_head.a.next = __malloc_head.a.prev = fp;
+    __malloc_head.next_free = __malloc_head.prev_free = fp;
 }
 
 static void *__malloc_from_block(struct free_arena_header *fp, size_t size)
 {
-  size_t fsize;
-  struct free_arena_header *nfp, *na;
-
-  fsize = fp->a.size;
-
-  /* We need the 2* to account for the larger requirements of a free block */
-  if ( fsize >= size+2*sizeof(struct arena_header) ) {
-    /* Bigger block than required -- split block */
-    nfp = (struct free_arena_header *)((char *)fp + size);
-    na = fp->a.next;
-
-    nfp->a.type = ARENA_TYPE_FREE;
-    nfp->a.size = fsize-size;
-    fp->a.type  = ARENA_TYPE_USED;
-    fp->a.size  = size;
-
-    /* Insert into all-block chain */
-    nfp->a.prev = fp;
-    nfp->a.next = na;
-    na->a.prev = nfp;
-    fp->a.next = nfp;
-
-    /* Replace current block on free chain */
-    nfp->next_free = fp->next_free;
-    nfp->prev_free = fp->prev_free;
-    fp->next_free->prev_free = nfp;
-    fp->prev_free->next_free = nfp;
-  } else {
-    /* Allocate the whole block */
-    fp->a.type = ARENA_TYPE_USED;
-
-    /* Remove from free chain */
-    fp->next_free->prev_free = fp->prev_free;
-    fp->prev_free->next_free = fp->next_free;
-  }
-
-  return (void *)(&fp->a + 1);
+    size_t fsize;
+    struct free_arena_header *nfp, *na;
+
+    fsize = fp->a.size;
+
+    /* We need the 2* to account for the larger requirements of a free block */
+    if (fsize >= size + 2 * sizeof(struct arena_header)) {
+	/* Bigger block than required -- split block */
+	nfp = (struct free_arena_header *)((char *)fp + size);
+	na = fp->a.next;
+
+	nfp->a.type = ARENA_TYPE_FREE;
+	nfp->a.size = fsize - size;
+	fp->a.type = ARENA_TYPE_USED;
+	fp->a.size = size;
+
+	/* Insert into all-block chain */
+	nfp->a.prev = fp;
+	nfp->a.next = na;
+	na->a.prev = nfp;
+	fp->a.next = nfp;
+
+	/* Replace current block on free chain */
+	nfp->next_free = fp->next_free;
+	nfp->prev_free = fp->prev_free;
+	fp->next_free->prev_free = nfp;
+	fp->prev_free->next_free = nfp;
+    } else {
+	/* Allocate the whole block */
+	fp->a.type = ARENA_TYPE_USED;
+
+	/* Remove from free chain */
+	fp->next_free->prev_free = fp->prev_free;
+	fp->prev_free->next_free = fp->next_free;
+    }
+
+    return (void *)(&fp->a + 1);
 }
 
 void *malloc(size_t size)
 {
-  struct free_arena_header *fp;
+    struct free_arena_header *fp;
 
-  if ( size == 0 )
-    return NULL;
+    if (size == 0)
+	return NULL;
 
-  /* Add the obligatory arena header, and round up */
-  size = (size+2*sizeof(struct arena_header)-1) & ~ARENA_SIZE_MASK;
+    /* Add the obligatory arena header, and round up */
+    size = (size + 2 * sizeof(struct arena_header) - 1) & ~ARENA_SIZE_MASK;
 
-  for ( fp = __malloc_head.next_free ; fp->a.type != ARENA_TYPE_HEAD ;
-	fp = fp->next_free ) {
-    if ( fp->a.size >= size ) {
-      /* Found fit -- allocate out of this block */
-      return __malloc_from_block(fp, size);
+    for (fp = __malloc_head.next_free; fp->a.type != ARENA_TYPE_HEAD;
+	 fp = fp->next_free) {
+	if (fp->a.size >= size) {
+	    /* Found fit -- allocate out of this block */
+	    return __malloc_from_block(fp, size);
+	}
     }
-  }
 
-  /* Nothing found... need to request a block from the kernel */
-  return NULL;			/* No kernel to get stuff from */
+    /* Nothing found... need to request a block from the kernel */
+    return NULL;		/* No kernel to get stuff from */
 }