X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=inline;f=gprof%2Fsym_ids.c;h=466f24a5aa6ce518ce615b5a85437a21740f6c25;hb=ed7e9d0bdaa0cbeb157e427c262e692a993e4432;hp=5b8f3971bf12d2e78ab026202965a8b194f35ce3;hpb=8db406db3cc6d3458f34df478aab371896401d5e;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/sym_ids.c b/gprof/sym_ids.c
index 5b8f3971bf..466f24a5aa 100644
--- a/gprof/sym_ids.c
+++ b/gprof/sym_ids.c
@@ -1,12 +1,12 @@
 /* sym_ids.c
 
-   Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999-2019 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,
@@ -19,9 +19,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "gprof.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
-#include "gprof.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
@@ -29,23 +29,25 @@
 #include "sym_ids.h"
 #include "corefile.h"
 
-static struct sym_id
+struct match
+  {
+    int prev_index;	/* Index of prev match.  */
+    Sym *prev_match;	/* Previous match.  */
+    Sym *first_match;	/* Chain of all matches.  */
+    Sym sym;
+  };
+
+struct sym_id
   {
     struct sym_id *next;
     char *spec;			/* Parsing modifies this.  */
     Table_Id which_table;
     bfd_boolean has_right;
 
-    struct match
-      {
-	int prev_index;		/* Index of prev match.  */
-	Sym *prev_match;	/* Previous match.  */
-	Sym *first_match;	/* Chain of all matches.  */
-	Sym sym;
-      }
-    left, right;
-  }
- *id_list;
+    struct match left, right;
+  };
+
+static struct sym_id  *id_list;
 
 static void parse_spec
   (char *, Sym *);
@@ -271,7 +273,7 @@ extend_match (struct match *m, Sym *sym, Sym_Table *tab, bfd_boolean second_pass
    requests---you get what you ask for!  */
 
 void
-sym_id_parse ()
+sym_id_parse (void)
 {
   Sym *sym, *left, *right;
   struct sym_id *id;