ran "indent -gnu"; have not fixed block comment style

1 files changed, 203 insertions, 169 deletions

diff --git a/gprof/symtab.c b/gprof/symtab.c
index 6591844..aab4ca2 100644
--- a/gprof/symtab.c
+++ b/gprof/symtab.c
@@ -10,19 +10,19 @@ Sym_Table symtab;
  * Initialize a symbol (so it's empty).
  */
 void
-DEFUN(sym_init, (sym), Sym *sym)
+DEFUN (sym_init, (sym), Sym * sym)
 {
-    memset(sym, 0, sizeof(*sym));
-    /*
-     * It is not safe to assume that a binary zero corresponds to
-     * a floating-point 0.0, so initialize floats explicitly:
-     */
-    sym->hist.time = 0.0;
-    sym->cg.child_time = 0.0;
-    sym->cg.prop.fract = 0.0;
-    sym->cg.prop.self  = 0.0;
-    sym->cg.prop.child = 0.0;
-} /* sym_init */
+  memset (sym, 0, sizeof (*sym));
+  /*
+   * It is not safe to assume that a binary zero corresponds to
+   * a floating-point 0.0, so initialize floats explicitly:
+   */
+  sym->hist.time = 0.0;
+  sym->cg.child_time = 0.0;
+  sym->cg.prop.fract = 0.0;
+  sym->cg.prop.self = 0.0;
+  sym->cg.prop.child = 0.0;
+}				/* sym_init */
 
 
 /*
@@ -36,198 +36,232 @@ DEFUN(sym_init, (sym), Sym *sym)
  * the global symbol survives.
  */
 static int
-DEFUN(cmp_addr, (lp, rp), const PTR lp AND const PTR rp)
+DEFUN (cmp_addr, (lp, rp), const PTR lp AND const PTR rp)
 {
-    Sym *left = (Sym*) lp;
-    Sym *right = (Sym*) rp;
+  Sym *left = (Sym *) lp;
+  Sym *right = (Sym *) rp;
 
-    if (left->addr > right->addr) {
-	return 1;
-    } else if (left->addr < right->addr) {
-	return -1;
-    } /* if */
+  if (left->addr > right->addr)
+    {
+      return 1;
+    }
+  else if (left->addr < right->addr)
+    {
+      return -1;
+    }				/* if */
 
-    if (left->is_func != right->is_func) {
-	return right->is_func - left->is_func;
-    } /* if */
+  if (left->is_func != right->is_func)
+    {
+      return right->is_func - left->is_func;
+    }				/* if */
 
-    return left->is_static - right->is_static;
-} /* cmp_addr */
+  return left->is_static - right->is_static;
+}				/* cmp_addr */
 
 
 void
-DEFUN(symtab_finalize, (tab), Sym_Table *tab)
+DEFUN (symtab_finalize, (tab), Sym_Table * tab)
 {
-    Sym *src, *dst;
-    bfd_vma prev_addr;
-
-    if (!tab->len) {
-	return;
-    } /* if */
-
-    /*
-     * Sort symbol table in order of increasing function addresses:
-     */
-    qsort(tab->base, tab->len, sizeof(Sym), cmp_addr);
-
-    /*
-     * Remove duplicate entries to speed-up later processing and
-     * set end_addr if its not set yet:
-     */
-    prev_addr = tab->base[0].addr + 1;
-    for (src = dst = tab->base; src < tab->limit; ++src) {
-	if (src->addr == prev_addr) {
-	    /*
-	     * If same address, favor global symbol over static one.
-	     * If both symbols are either static or global, check
-	     * whether one has name beginning with underscore while
-	     * the other doesn't.  In such cases, keep sym without
-	     * underscore.  This takes cares of compiler generated
-	     * symbols (such as __gnu_compiled, __c89_used, etc.).
-	     */
-	    if ((!src->is_static && dst[-1].is_static)
-		|| ((src->is_static == dst[-1].is_static) &&
-		    (src->name[0] != '_' && dst[-1].name[0] == '_')
-		    || (src->name[0]
-			&& src->name[1] != '_' && dst[-1].name[1] == '_')))
+  Sym *src, *dst;
+  bfd_vma prev_addr;
+
+  if (!tab->len)
+    {
+      return;
+    }				/* if */
+
+  /*
+   * Sort symbol table in order of increasing function addresses:
+   */
+  qsort (tab->base, tab->len, sizeof (Sym), cmp_addr);
+
+  /*
+   * Remove duplicate entries to speed-up later processing and
+   * set end_addr if its not set yet:
+   */
+  prev_addr = tab->base[0].addr + 1;
+  for (src = dst = tab->base; src < tab->limit; ++src)
+    {
+      if (src->addr == prev_addr)
+	{
+	  /*
+	   * If same address, favor global symbol over static one.
+	   * If both symbols are either static or global, check
+	   * whether one has name beginning with underscore while
+	   * the other doesn't.  In such cases, keep sym without
+	   * underscore.  This takes cares of compiler generated
+	   * symbols (such as __gnu_compiled, __c89_used, etc.).
+	   */
+	  if ((!src->is_static && dst[-1].is_static)
+	      || ((src->is_static == dst[-1].is_static) &&
+		  (src->name[0] != '_' && dst[-1].name[0] == '_')
+		  || (src->name[0]
+		      && src->name[1] != '_' && dst[-1].name[1] == '_')))
 	    {
-		DBG(AOUTDEBUG|IDDEBUG,
-		    printf("[symtab_finalize] favor %s@%c%c over %s@%c%c",
+	      DBG (AOUTDEBUG | IDDEBUG,
+		   printf ("[symtab_finalize] favor %s@%c%c over %s@%c%c",
 			   src->name, src->is_static ? 't' : 'T',
 			   src->is_func ? 'F' : 'f',
 			   dst[-1].name, dst[-1].is_static ? 't' : 'T',
 			   dst[-1].is_func ? 'F' : 'f');
-		    printf(" (addr=%lx)\n", src->addr));
-		dst[-1] = *src;
-	    } else {
-		DBG(AOUTDEBUG|IDDEBUG,
-		    printf("[symtab_finalize] favor %s@%c%c over %s@%c%c",
+		   printf (" (addr=%lx)\n", src->addr));
+	      dst[-1] = *src;
+	    }
+	  else
+	    {
+	      DBG (AOUTDEBUG | IDDEBUG,
+		   printf ("[symtab_finalize] favor %s@%c%c over %s@%c%c",
 			   dst[-1].name, dst[-1].is_static ? 't' : 'T',
 			   dst[-1].is_func ? 'F' : 'f',
 			   src->name, src->is_static ? 't' : 'T',
 			   src->is_func ? 'F' : 'f');
-		    printf(" (addr=%lx)\n", src->addr));
-	    } /* if */
-	} else {
-	    if (dst > tab->base && dst[-1].end_addr == 0) {
-		dst[-1].end_addr = src->addr - 1;
-	    } /* if */
-
-	    /* retain sym only if it has a non-empty address range: */
-	    if (!src->end_addr  || src->addr <= src->end_addr) {
-		*dst++ = *src;
-		prev_addr = src->addr;
-	    } /* if */
-	} /* if */
-    } /* if */
-    if (tab->len > 0 && dst[-1].end_addr == 0) {
-	dst[-1].end_addr = core_text_sect->vma + core_text_sect->_raw_size - 1;
-    } /* if */
-
-    DBG(AOUTDEBUG|IDDEBUG,
-	printf("[symtab_finalize]: removed %d duplicate entries\n",
+		   printf (" (addr=%lx)\n", src->addr));
+	    }			/* if */
+	}
+      else
+	{
+	  if (dst > tab->base && dst[-1].end_addr == 0)
+	    {
+	      dst[-1].end_addr = src->addr - 1;
+	    }			/* if */
+
+	  /* retain sym only if it has a non-empty address range: */
+	  if (!src->end_addr || src->addr <= src->end_addr)
+	    {
+	      *dst++ = *src;
+	      prev_addr = src->addr;
+	    }			/* if */
+	}			/* if */
+    }				/* if */
+  if (tab->len > 0 && dst[-1].end_addr == 0)
+    {
+      dst[-1].end_addr = core_text_sect->vma + core_text_sect->_raw_size - 1;
+    }				/* if */
+
+  DBG (AOUTDEBUG | IDDEBUG,
+       printf ("[symtab_finalize]: removed %d duplicate entries\n",
 	       tab->len - (int) (dst - tab->base)));
 
-    tab->limit = dst;
-    tab->len = tab->limit - tab->base;
+  tab->limit = dst;
+  tab->len = tab->limit - tab->base;
 
-    DBG(AOUTDEBUG|IDDEBUG,
-	int j;
+  DBG (AOUTDEBUG | IDDEBUG,
+       int j;
 
-	for (j = 0; j < tab->len; ++j){
-	    printf("[symtab_finalize] 0x%lx-0x%lx\t%s\n",
-		   (long) tab->base[j].addr, (long) tab->base[j].end_addr,
-		   tab->base[j].name);
-	} /* for */);
-} /* symtab_finalize */
+       for (j = 0; j < tab->len; ++j)
+       {
+       printf ("[symtab_finalize] 0x%lx-0x%lx\t%s\n",
+	       (long) tab->base[j].addr, (long) tab->base[j].end_addr,
+	       tab->base[j].name);
+       }			/* for */
+  );
+}				/* symtab_finalize */
 
 
 #ifdef DEBUG
 
-Sym*
-DEFUN(dbg_sym_lookup, (symtab, address), Sym_Table *symtab AND bfd_vma address)
+Sym *
+DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
 {
-    long low, mid, high;
-    Sym *sym;
-
-    fprintf(stderr,"[sym_lookup] address 0x%lx\n", address);
-    
-    sym = symtab->base;
-    for (low = 0, high = symtab->len - 1 ; low != high ;) {
-	mid = (high + low) >> 1;
-	fprintf(stderr, "[dbg_sym_lookup] low=0x%lx, mid=0x%lx, high=0x%lx\n",
-		low, mid, high);
-	fprintf(stderr, "[dbg_sym_lookup] sym[m]=0x%lx sym[m + 1]=0x%lx\n",
-		sym[mid].addr, sym[mid + 1].addr);
-	if (sym[mid].addr <= address && sym[mid + 1].addr > address) {
-	    return &sym[mid];
-	} /* if */
-	if (sym[mid].addr > address) {
-	    high = mid;
-	} else {
-	    low = mid + 1;
-	} /* if */
-    } /* for */
-    fprintf(stderr, "[sym_lookup] binary search fails???\n");
-    return 0;
-} /* dbg_sym_lookup */
-
-#endif DEBUG
+  long low, mid, high;
+  Sym *sym;
+
+  fprintf (stderr, "[sym_lookup] address 0x%lx\n", address);
+
+  sym = symtab->base;
+  for (low = 0, high = symtab->len - 1; low != high;)
+    {
+      mid = (high + low) >> 1;
+      fprintf (stderr, "[dbg_sym_lookup] low=0x%lx, mid=0x%lx, high=0x%lx\n",
+	       low, mid, high);
+      fprintf (stderr, "[dbg_sym_lookup] sym[m]=0x%lx sym[m + 1]=0x%lx\n",
+	       sym[mid].addr, sym[mid + 1].addr);
+      if (sym[mid].addr <= address && sym[mid + 1].addr > address)
+	{
+	  return &sym[mid];
+	}			/* if */
+      if (sym[mid].addr > address)
+	{
+	  high = mid;
+	}
+      else
+	{
+	  low = mid + 1;
+	}			/* if */
+    }				/* for */
+  fprintf (stderr, "[sym_lookup] binary search fails???\n");
+  return 0;
+}				/* dbg_sym_lookup */
+
+#endif	/* DEBUG */
 
 
 /*
  * Look up an address in the symbol-table that is sorted by address.
  * If address does not hit any symbol, 0 is returned.
  */
-Sym*
-DEFUN(sym_lookup, (symtab, address), Sym_Table *symtab AND bfd_vma address)
+Sym *
+DEFUN (sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
 {
-    long low, high;
-    long mid = -1;
-    Sym *sym;
-#ifdef DEBUG    
-    int probes = 0;
+  long low, high;
+  long mid = -1;
+  Sym *sym;
+#ifdef DEBUG
+  int probes = 0;
 #endif /* DEBUG */
 
-    if (!symtab->len) {
-	return 0;
-    } /* if */
-
-    sym = symtab->base;
-    for (low = 0, high = symtab->len - 1 ; low != high ;) {
-	DBG(LOOKUPDEBUG, ++probes);
-	mid = (high + low) / 2;
-	if (sym[mid].addr <= address && sym[mid + 1].addr > address) {
-	    if (address > sym[mid].end_addr) {
-		/*
-		 * Address falls into gap between sym[mid] and
-		 * sym[mid + 1]:
-		 */
-		return 0;
-	    } else {
-		DBG(LOOKUPDEBUG,
-		    printf("[sym_lookup] %d probes (symtab->len=%d)\n",
+  if (!symtab->len)
+    {
+      return 0;
+    }				/* if */
+
+  sym = symtab->base;
+  for (low = 0, high = symtab->len - 1; low != high;)
+    {
+      DBG (LOOKUPDEBUG, ++probes);
+      mid = (high + low) / 2;
+      if (sym[mid].addr <= address && sym[mid + 1].addr > address)
+	{
+	  if (address > sym[mid].end_addr)
+	    {
+	      /*
+	       * Address falls into gap between sym[mid] and
+	       * sym[mid + 1]:
+	       */
+	      return 0;
+	    }
+	  else
+	    {
+	      DBG (LOOKUPDEBUG,
+		   printf ("[sym_lookup] %d probes (symtab->len=%d)\n",
 			   probes, symtab->len - 1));
-		return &sym[mid];
-	    } /* if */
-	} /* if */
-	if (sym[mid].addr > address) {
-	    high = mid;
-	} else {
-	    low = mid + 1;
-	} /* if */
-    } /* for */
-    if (sym[mid + 1].addr <= address) {
-	if (address > sym[mid + 1].end_addr) {
-	    /* address is beyond end of sym[mid + 1]: */
-	    return 0;
-	} else {
-	    DBG(LOOKUPDEBUG, printf("[sym_lookup] %d (%d) probes, fall off\n",
+	      return &sym[mid];
+	    }			/* if */
+	}			/* if */
+      if (sym[mid].addr > address)
+	{
+	  high = mid;
+	}
+      else
+	{
+	  low = mid + 1;
+	}			/* if */
+    }				/* for */
+  if (sym[mid + 1].addr <= address)
+    {
+      if (address > sym[mid + 1].end_addr)
+	{
+	  /* address is beyond end of sym[mid + 1]: */
+	  return 0;
+	}
+      else
+	{
+	  DBG (LOOKUPDEBUG, printf ("[sym_lookup] %d (%d) probes, fall off\n",
 				    probes, symtab->len - 1));
-	    return &sym[mid + 1];
-	} /* if */
-    } /* if */
-    return 0;
-} /* sym_lookup */
+	  return &sym[mid + 1];
+	}			/* if */
+    }				/* if */
+  return 0;
+}				/* sym_lookup */
 
-			/*** end of symtab.c ***/
+/*** end of symtab.c ***/