Fixing some tab damage from Jay's commit

diff --git a/alloc.c b/alloc.c
index 3d0169b038518c406ffbd87d9b6d0049a45b1894..16b20e2102edba5c7b7c9a15b0d18b2f6e5da559 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -335,7 +335,7 @@ GC_collect_end_callback_Proc GC_set_collect_end_callback(GC_collect_end_callback
 GC_bool GC_try_to_collect_inner(GC_stop_func stop_func)
 {
     CLOCK_TYPE start_time = CLOCK_ZERO;
-       CLOCK_TYPE current_time;
+    CLOCK_TYPE current_time;
     if (GC_dont_gc) return FALSE;
     /* PLTSCHEME */
     if (GC_collect_start_callback)
@@ -483,10 +483,10 @@ GC_bool GC_stopped_mark(GC_stop_func stop_func)
     unsigned i;
     int dummy;
     CLOCK_TYPE start_time = CLOCK_ZERO;
-       CLOCK_TYPE current_time;
-       
+    CLOCK_TYPE current_time;
+
     if (GC_print_stats)
-       GET_TIME(start_time);
+      GET_TIME(start_time);
 
 #   if !defined(REDIRECT_MALLOC) && (defined(MSWIN32) || defined(MSWINCE))
         GC_add_current_malloc_heap();

diff --git a/mark.c b/mark.c
index 5ab35b66bcfcd0012e8440f98381ec3f5d8f18c0..c53a307bd60ae21c733ca11a47e6d34f12726da1 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -617,11 +617,11 @@ void GC_mark_overflow_recover(void *p)
  */
 mse * GC_mark_from(mse *mark_stack_top, mse *mark_stack, mse *mark_stack_limit)
 {
-  signed_word credit = HBLKSIZE;  /* Remaining credit for marking work */
-  ptr_t current_p;     /* Pointer to current candidate ptr.    */
-  word current;        /* Candidate pointer.                   */
-  ptr_t limit = NULL;  /* (Incl) limit of current candidate    */
-                                               /* range                                */
+  signed_word credit = HBLKSIZE;  /* Remaining credit for marking work */
+  ptr_t current_p;      /* Pointer to current candidate ptr. */
+  word current;         /* Candidate pointer.                */
+  ptr_t limit = NULL;   /* (Incl) limit of current candidate */
+                        /* range                             */
   word descr;
   ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
   ptr_t least_ha = GC_least_plausible_heap_addr;

diff --git a/mark_rts.c b/mark_rts.c
index ef60d8074ffea71102324c25d7e2ac278b2d0462..f426799c1b72f26e9d18feb5bdc8b32c0d6ae8de 100644 (file)
--- a/mark_rts.c
+++ b/mark_rts.c
@@ -369,7 +369,7 @@ ptr_t GC_approx_sp(void)
 #   ifdef _MSC_VER
 #     pragma warning(disable:4172)
 #   endif
-       ptr_t addr = ((ptr_t)(&dummy));
+    ptr_t addr = ((ptr_t)(&dummy));
     return addr;
 #   ifdef _MSC_VER
 #     pragma warning(default:4172)

diff --git a/new_hblk.c b/new_hblk.c
index 9d6810e45c76ffb7a57a99fbf40d837c961227d0..dd188550320693184d5abcf4f701f462cafc2546 100644 (file)
--- a/new_hblk.c
+++ b/new_hblk.c
@@ -118,55 +118,55 @@ ptr_t GC_build_fl(struct hblk *h, size_t sz, GC_bool clear, ptr_t list)
   /* If we were more serious about it, these should go inside  */
   /* the loops.  But write prefetches usually don't seem to    */
   /* matter much.                                              */
-    PREFETCH_FOR_WRITE((ptr_t)h);
-    PREFETCH_FOR_WRITE((ptr_t)h + 128);
-    PREFETCH_FOR_WRITE((ptr_t)h + 256);
-    PREFETCH_FOR_WRITE((ptr_t)h + 378);
+  PREFETCH_FOR_WRITE((ptr_t)h);
+  PREFETCH_FOR_WRITE((ptr_t)h + 128);
+  PREFETCH_FOR_WRITE((ptr_t)h + 256);
+  PREFETCH_FOR_WRITE((ptr_t)h + 378);
   /* Handle small objects sizes more efficiently.  For larger objects  */
   /* the difference is less significant.                               */
 #  ifndef SMALL_CONFIG
-    switch (sz) {
-        case 2: if (clear) {
-                   return GC_build_fl_clear2(h, list);
-               } else {
-                   return GC_build_fl2(h, list);
-               }
-        case 4: if (clear) {
-                   return GC_build_fl_clear4(h, list);
-               } else {
-                   return GC_build_fl4(h, list);
-               }
-        default:
-               break;
+  switch (sz) {
+  case 2: if (clear) {
+      return GC_build_fl_clear2(h, list);
+    } else {
+      return GC_build_fl2(h, list);
     }
+  case 4: if (clear) {
+      return GC_build_fl_clear4(h, list);
+    } else {
+      return GC_build_fl4(h, list);
+    }
+  default:
+    break;
+  }
 #  endif /* !SMALL_CONFIG */
-    
+
   /* Clear the page if necessary. */
-    if (clear) BZERO(h, HBLKSIZE);
-    
+  if (clear) BZERO(h, HBLKSIZE);
+
   /* Add objects to free list */
-    p = (word *)(h -> hb_body) + sz;   /* second object in *h  */
-    prev = (word *)(h -> hb_body);             /* One object behind p  */
-    last_object = (word *)((char *)h + HBLKSIZE);
-    last_object -= sz;
-                           /* Last place for last object to start */
+  p = (word *)(h -> hb_body) + sz;  /* second object in *h */
+  prev = (word *)(h -> hb_body);    /* One object behind p */
+  last_object = (word *)((char *)h + HBLKSIZE);
+  last_object -= sz;
+                     /* Last place for last object to start */
 
   /* make a list of all objects in *h with head as last object */
-    while (p <= last_object) {
-      /* current object's link points to last object */
-        obj_link(p) = (ptr_t)prev;
-       prev = p;
-       p += sz;
-    }
-    p -= sz;                   /* p now points to last object */
+  while (p <= last_object) {
+    /* current object's link points to last object */
+    obj_link(p) = (ptr_t)prev;
+    prev = p;
+    p += sz;
+  }
+  p -= sz;                     /* p now points to last object */
 
   /*
    * put p (which is now head of list of objects in *h) as first
    * pointer in the appropriate free list for this size.
    */
-         word *tmp = (word *)h->hb_body;
-      obj_link(tmp) = list;
-      return ((ptr_t)p);
+  word *tmp = (word *)h->hb_body;
+  obj_link(tmp) = list;
+  return ((ptr_t)p);
 }
 
 

diff --git a/os_dep.c b/os_dep.c
index 48f28569f49c4b3a3ff82a775b35480da6cd7dc9..4e647a287b8b727a9492b87d5fcc1639364ee866 100644 (file)
--- a/os_dep.c
+++ b/os_dep.c
@@ -1217,7 +1217,7 @@ ptr_t GC_get_main_stack_base(void)
 #   if defined(HEURISTIC1) || defined(HEURISTIC2)
       MAYBE_UNUSED word dummy;
 #   endif
-       MAYBE_UNUSED ptr_t result;
+      MAYBE_UNUSED ptr_t result;
 
 #   define STACKBOTTOM_ALIGNMENT_M1 ((word)STACK_GRAN - 1)
 

diff --git a/pthread_stop_world.c b/pthread_stop_world.c
index 2b8d6443340ae26045f1d7bb761c4f7bf1843dd9..62241e6da36ca0ce681e69958b9e34eb6dc661de 100644 (file)
--- a/pthread_stop_world.c
+++ b/pthread_stop_world.c
@@ -223,7 +223,7 @@ void GC_suspend_handler_inner(ptr_t sig_arg, void *context)
 void GC_restart_handler(int sig)
 {
     MAYBE_UNUSED pthread_t my_thread = pthread_self();
-       MAYBE_UNUSED GC_thread me;
+    MAYBE_UNUSED GC_thread me;
 
     if (sig != SIG_THR_RESTART) ABORT("Bad signal in suspend_handler");