* corefile.c (core_init): Use a separate local variable,

[deliverable/binutils-gdb.git] / gprof / gprof.c

diff --git a/gprof/gprof.c b/gprof/gprof.c
index b633f0e6a26a6bc57c14a87d238561d01c49ac76..381118c9d05f4c7c3ffeeb1882a969240ab2181d 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -58,19 +58,19 @@ long hz = HZ_WRONG;
 int debug_level = 0;
 int output_style = 0;
 int output_width = 80;
-boolean bsd_style_output = false;
-boolean demangle = true;
-boolean discard_underscores = true;
-boolean ignore_direct_calls = false;
-boolean ignore_static_funcs = false;
-boolean ignore_zeros = true;
-boolean line_granularity = false;
-boolean print_descriptions = true;
-boolean print_path = false;
-boolean ignore_non_functions = false;
+bfd_boolean bsd_style_output = FALSE;
+bfd_boolean demangle = TRUE;
+bfd_boolean discard_underscores = TRUE;
+bfd_boolean ignore_direct_calls = FALSE;
+bfd_boolean ignore_static_funcs = FALSE;
+bfd_boolean ignore_zeros = TRUE;
+bfd_boolean line_granularity = FALSE;
+bfd_boolean print_descriptions = TRUE;
+bfd_boolean print_path = FALSE;
+bfd_boolean ignore_non_functions = FALSE;
 File_Format file_format = FF_AUTO;
 
-boolean first_output = true;
+bfd_boolean first_output = TRUE;
 
 char copyright[] =
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
@@ -210,7 +210,7 @@ main (argc, argv)
       switch (ch)
        {
        case 'a':
-         ignore_static_funcs = true;
+         ignore_static_funcs = TRUE;
          break;
        case 'A':
          if (optarg)
@@ -221,14 +221,14 @@ main (argc, argv)
          user_specified |= STYLE_ANNOTATED_SOURCE;
          break;
        case 'b':
-         print_descriptions = false;
+         print_descriptions = FALSE;
          break;
        case 'B':
          output_style |= STYLE_CALL_GRAPH;
          user_specified |= STYLE_CALL_GRAPH;
          break;
        case 'c':
-         ignore_direct_calls = true;
+         ignore_direct_calls = TRUE;
          break;
        case 'C':
          if (optarg)
@@ -254,7 +254,7 @@ main (argc, argv)
 #endif /* DEBUG */
          break;
        case 'D':
-         ignore_non_functions = true;
+         ignore_non_functions = TRUE;
          break;
        case 'E':
          sym_id_add (optarg, EXCL_TIME);
@@ -297,10 +297,10 @@ main (argc, argv)
          sym_id_add (optarg, EXCL_ARCS);
          break;
        case 'l':
-         line_granularity = true;
+         line_granularity = TRUE;
          break;
        case 'L':
-         print_path = true;
+         print_path = TRUE;
          break;
        case 'm':
          bb_min_calls = (unsigned long) strtoul (optarg, (char **) NULL, 10);
@@ -410,7 +410,7 @@ main (argc, argv)
            }
          break;
        case 'T':
-         bsd_style_output = true;
+         bsd_style_output = TRUE;
          break;
        case 'v':
          /* This output is intended to follow the GNU standards document.  */
@@ -427,13 +427,13 @@ This program is free software.  This program has absolutely no warranty.\n"));
            }
          break;
        case 'x':
-         bb_annotate_all_lines = true;
+         bb_annotate_all_lines = TRUE;
          break;
        case 'y':
-         create_annotation_files = true;
+         create_annotation_files = TRUE;
          break;
        case 'z':
-         ignore_zeros = false;
+         ignore_zeros = FALSE;
          break;
        case 'Z':
          if (optarg)
@@ -448,7 +448,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
          user_specified |= STYLE_ANNOTATED_SOURCE;
          break;
        case OPTION_DEMANGLE:
-         demangle = true;
+         demangle = TRUE;
          if (optarg != NULL)
            {
              enum demangling_styles style;
@@ -466,7 +466,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
           }
          break;
        case OPTION_NO_DEMANGLE:
-         demangle = false;
+         demangle = FALSE;
          break;
        default:
          usage (stderr, 1);
@@ -483,7 +483,8 @@ This program is free software.  This program has absolutely no warranty.\n"));
       done (1);
     }
 
-  /* --sum implies --line, otherwise we'd lose b-b counts in gmon.sum */
+  /* --sum implies --line, otherwise we'd lose basic block counts in
+       gmon.sum */
   if (output_style & STYLE_SUMMARY_FILE)
     {
       line_granularity = 1;
@@ -520,71 +521,36 @@ This program is free software.  This program has absolutely no warranty.\n"));
    * functions off the flat profile:
    */
   if (line_granularity)
-    {
-      for (sp = &default_excluded_list[0]; *sp; sp++)
-       {
-         sym_id_add (*sp, EXCL_FLAT);
-       }
-    }
+    for (sp = &default_excluded_list[0]; *sp; sp++)
+      sym_id_add (*sp, EXCL_FLAT);
 
-  /*
-   * Read symbol table from core file:
-   */
+  /* Read symbol table from core file.  */
   core_init (a_out_name);
 
-  /*
-   * If we should ignore direct function calls, we need to load
-   * to core's text-space:
-   */
+  /* If we should ignore direct function calls, we need to load to
+     core's text-space.  */
   if (ignore_direct_calls)
-    {
-      core_get_text_space (core_bfd);
-    }
+    core_get_text_space (core_bfd);
 
-  /*
-   * Create symbols from core image:
-   */
+  /* Create symbols from core image.  */
   if (line_granularity)
-    {
-      core_create_line_syms (core_bfd);
-    }
+    core_create_line_syms ();
   else
-    {
-      core_create_function_syms (core_bfd);
-    }
+    core_create_function_syms ();
 
-  /*
-   * Translate sym specs into syms:
-   */
+  /* Translate sym specs into syms.  */
   sym_id_parse ();
 
   if (file_format == FF_PROF)
     {
-#ifdef PROF_SUPPORT_IMPLEMENTED
-      /*
-       * Get information about mon.out file(s):
-       */
-      do
-       {
-         mon_out_read (gmon_name);
-         if (optind < argc)
-           {
-             gmon_name = argv[optind];
-           }
-       }
-      while (optind++ < argc);
-#else
       fprintf (stderr,
               _("%s: sorry, file format `prof' is not yet supported\n"),
               whoami);
       done (1);
-#endif
     }
   else
     {
-      /*
-       * Get information about gmon.out file(s):
-       */
+      /* Get information about gmon.out file(s).  */
       do
        {
          gmon_out_read (gmon_name);
@@ -603,19 +569,15 @@ This program is free software.  This program has absolutely no warranty.\n"));
   if (output_style == 0)
     {
       if (gmon_input & (INPUT_HISTOGRAM | INPUT_CALL_GRAPH))
-       {
-         output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH;
-       }
+       output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH;
       else
-       {
-         output_style = STYLE_EXEC_COUNTS;
-       }
+       output_style = STYLE_EXEC_COUNTS;
+
       output_style &= ~user_specified;
     }
 
-  /*
-   * Dump a gmon.sum file if requested (before any other processing!):
-   */
+  /* Dump a gmon.sum file if requested (before any other
+     processing!)  */
   if (output_style & STYLE_SUMMARY_FILE)
     {
       gmon_out_write (GMONSUM);
@@ -631,8 +593,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
       cg = cg_assemble ();
     }
 
-  /* do some simple sanity checks: */
-
+  /* Do some simple sanity checks.  */
   if ((output_style & STYLE_FLAT_PROFILE)
       && !(gmon_input & INPUT_HISTOGRAM))
     {