daily update

[deliverable/binutils-gdb.git] / binutils / sysinfo.y

diff --git a/binutils/sysinfo.y b/binutils/sysinfo.y
index bf19263c5d17705c4d7ac413ff4a6406065deacd..a7077480bc4a2ccfc793a12de59acb774907f3fe 100644 (file)
--- a/binutils/sysinfo.y
+++ b/binutils/sysinfo.y
@@ -1,4 +1,4 @@
-/* Copyright 2001, 2003 Free Software Foundation, Inc.
+/* Copyright 2001, 2003, 2005 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
 This file is part of GNU binutils.
@@ -15,28 +15,24 @@ GNU General Public License for more details.
 
 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 <stdio.h>
 #include <stdlib.h>
 
-extern char *word;
-extern char writecode;
-extern int number;
-extern int unit;
-char nice_name[1000];
-char *it;
-int sofar;
-int width;
-int code;
-char * repeat;
-char *oldrepeat;
-char *name;
-int rdepth;
-char *loop [] = {"","n","m","/*BAD*/"};
-char *names[] = {" ","[n]","[n][m]"};
-char *pnames[]= {"","*","**"};
+static char writecode;
+static char *it;
+static int code;
+static char * repeat;
+static char *oldrepeat;
+static char *name;
+static int rdepth;
+static char *names[] = {" ","[n]","[n][m]"};
+static char *pnames[]= {"","*","**"};
+
+static int yyerror (char *s);
+extern int yylex (void);
 %}
 
 
@@ -117,7 +113,7 @@ it:
            printf("void sysroff_swap_%s_in(ptr)\n",$2);
            printf("struct IT_%s *ptr;\n", it);
            printf("{\n");
-           printf("char raw[255];\n");
+           printf("unsigned char raw[255];\n");
            printf("\tint idx = 0 ;\n");
            printf("\tint size;\n");
            printf("memset(raw,0,255);\n");     
@@ -129,7 +125,7 @@ it:
            printf("FILE * file;\n");
            printf("struct IT_%s *ptr;\n", it);
            printf("{\n");
-           printf("\tchar raw[255];\n");
+           printf("\tunsigned char raw[255];\n");
            printf("\tint idx = 16 ;\n");
            printf("\tmemset (raw, 0, 255);\n");
            printf("\tcode = IT_%s_CODE;\n", it);
@@ -412,7 +408,6 @@ enum_list:
    -c write code to print info in human form */
 
 int yydebug;
-char writecode;
 
 int 
 main (int ac, char **av)
@@ -431,7 +426,7 @@ if (writecode == 'd')
 return 0;
 }
 
-int
+static int
 yyerror (char *s)
 {
   fprintf(stderr, "%s\n" , s);