X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gprof%2Fsource.c;h=1a445d3315f3427f1114ffe46cff14e6325fd89b;hb=359cc68c808f70750a020c9bb76de330735a3202;hp=496373e752f7849d7edf47ef66e5b6aad9b8fa9f;hpb=1355568ab48a9dcfd079493f7deb5e1c5e88015b;p=binutils-gdb.git

diff --git a/gprof/source.c b/gprof/source.c
index 496373e752f..1a445d3315f 100644
--- a/gprof/source.c
+++ b/gprof/source.c
@@ -1,12 +1,12 @@
 /* source.c - Keep track of source files.
 
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include "gprof.h"
 #include "libiberty.h"
@@ -28,15 +28,14 @@
 #define EXT_ANNO "-ann"		/* Postfix of annotated files.  */
 
 /* Default option values.  */
-boolean create_annotation_files = false;
+bfd_boolean create_annotation_files = FALSE;
 
 Search_List src_search_list = {0, 0};
 Source_File *first_src_file = 0;
 
 
 Source_File *
-source_file_lookup_path (path)
-     const char *path;
+source_file_lookup_path (const char *path)
 {
   Source_File *sf;
 
@@ -63,8 +62,7 @@ source_file_lookup_path (path)
 
 
 Source_File *
-source_file_lookup_name (filename)
-     const char *filename;
+source_file_lookup_name (const char *filename)
 {
   const char *fname;
   Source_File *sf;
@@ -91,15 +89,13 @@ source_file_lookup_name (filename)
 
 
 FILE *
-annotate_source (sf, max_width, annote, arg)
-     Source_File *sf;
-     unsigned int max_width;
-     void (*annote) PARAMS ((char *, unsigned int, int, void *));
-     void *arg;
+annotate_source (Source_File *sf, unsigned int max_width,
+     void (*annote) (char *, unsigned int, int, void *),
+     void *arg)
 {
-  static boolean first_file = true;
+  static bfd_boolean first_file = TRUE;
   int i, line_num, nread;
-  boolean new_line;
+  bfd_boolean new_line;
   char buf[8192];
   char fname[PATH_MAX];
   char *annotation, *name_only;
@@ -114,7 +110,7 @@ annotate_source (sf, max_width, annote, arg)
     sle = 0;			/* Don't use search list for absolute paths.  */
 
   name_only = 0;
-  while (true)
+  while (TRUE)
     {
       DBG (SRCDEBUG, printf ("[annotate_source]: looking for %s, trying %s\n",
 			     sf->name, fname));
@@ -229,21 +225,21 @@ annotate_source (sf, max_width, annote, arg)
   if (ofp == stdout)
     {
       if (first_file)
-	first_file = false;
+	first_file = FALSE;
       else
 	fputc ('\n', ofp);
 
       if (first_output)
-	first_output = false;
+	first_output = FALSE;
       else
 	fprintf (ofp, "\f\n");
 
       fprintf (ofp, _("*** File %s:\n"), sf->name);
     }
 
-  annotation = xmalloc (max_width + 1);
+  annotation = (char *) xmalloc (max_width + 1);
   line_num = 1;
-  new_line = true;
+  new_line = TRUE;
 
   while ((nread = fread (buf, 1, sizeof (buf), ifp)) > 0)
     {
@@ -254,7 +250,7 @@ annotate_source (sf, max_width, annote, arg)
 	      (*annote) (annotation, max_width, line_num, arg);
 	      fputs (annotation, ofp);
 	      ++line_num;
-	      new_line = false;
+	      new_line = FALSE;
 	    }
 
 	  new_line = (buf[i] == '\n');