X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Fcg_dfn.c;h=1da4c66b84f215b80774f5ed12ba5d5d289ab015;hb=4c6ee6465acc58f0f86c44668c4e862901186239;hp=ace8328d1411f0616df11dfdef3ed149574addd6;hpb=bde52789b2840efede7cba2971d8b174586018fc;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/cg_dfn.c b/gprof/cg_dfn.c
index ace8328d14..1da4c66b84 100644
--- a/gprof/cg_dfn.c
+++ b/gprof/cg_dfn.c
@@ -1,23 +1,33 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
@@ -34,6 +44,12 @@ typedef struct
   }
 DFN_Stack;
 
+static bfd_boolean is_numbered (Sym *);
+static bfd_boolean is_busy (Sym *);
+static void find_cycle (Sym *);
+static void pre_visit (Sym *);
+static void post_visit (Sym *);
+
 DFN_Stack *dfn_stack = NULL;
 int dfn_maxdepth = 0;
 int dfn_depth = 0;
@@ -43,8 +59,8 @@ int dfn_counter = DFN_NAN;
 /*
  * Is CHILD already numbered?
  */
-static boolean
-DEFUN (is_numbered, (child), Sym * child)
+static bfd_boolean
+is_numbered (Sym *child)
 {
   return child->cg.top_order != DFN_NAN && child->cg.top_order != DFN_BUSY;
 }
@@ -53,14 +69,14 @@ DEFUN (is_numbered, (child), Sym * child)
 /*
  * Is CHILD already busy?
  */
-static boolean
-DEFUN (is_busy, (child), Sym * child)
+static bfd_boolean
+is_busy (Sym *child)
 {
   if (child->cg.top_order == DFN_NAN)
     {
-      return false;
+      return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 
@@ -71,12 +87,12 @@ DEFUN (is_busy, (child), Sym * child)
  * depth-first number).
  */
 static void
-DEFUN (find_cycle, (child), Sym * child)
+find_cycle (Sym *child)
 {
   Sym *head = 0;
   Sym *tail;
   int cycle_top;
-  int index;
+  int cycle_index;
 
   for (cycle_top = dfn_depth; cycle_top > 0; --cycle_top)
     {
@@ -153,9 +169,9 @@ DEFUN (find_cycle, (child), Sym * child)
 	       print_name (head);
 	       printf ("\n"));
 	}
-      for (index = cycle_top + 1; index <= dfn_depth; ++index)
+      for (cycle_index = cycle_top + 1; cycle_index <= dfn_depth; ++cycle_index)
 	{
-	  child = dfn_stack[index].sym;
+	  child = dfn_stack[cycle_index].sym;
 	  if (child->cg.cyc.head == child)
 	    {
 	      /*
@@ -194,14 +210,15 @@ DEFUN (find_cycle, (child), Sym * child)
  * the stack and mark it busy.
  */
 static void
-DEFUN (pre_visit, (parent), Sym * parent)
+pre_visit (Sym *parent)
 {
   ++dfn_depth;
 
   if (dfn_depth >= dfn_maxdepth)
     {
       dfn_maxdepth += DFN_INCR_DEPTH;
-      dfn_stack = xrealloc (dfn_stack, dfn_maxdepth * sizeof *dfn_stack);
+      dfn_stack = (DFN_Stack *) xrealloc (dfn_stack,
+                                          dfn_maxdepth * sizeof *dfn_stack);
     }
 
   dfn_stack[dfn_depth].sym = parent;
@@ -218,7 +235,7 @@ DEFUN (pre_visit, (parent), Sym * parent)
  * and number functions if PARENT is head of a cycle.
  */
 static void
-DEFUN (post_visit, (parent), Sym * parent)
+post_visit (Sym *parent)
 {
   Sym *member;
 
@@ -252,7 +269,7 @@ DEFUN (post_visit, (parent), Sym * parent)
  * Given this PARENT, depth first number its children.
  */
 void
-DEFUN (cg_dfn, (parent), Sym * parent)
+cg_dfn (Sym *parent)
 {
   Arc *arc;