From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 892 invoked by alias); 16 Jan 2012 21:07:11 -0000 Received: (qmail 884 invoked by uid 22791); 16 Jan 2012 21:07:10 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_BJ,TW_YY,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Jan 2012 21:06:52 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0GL6qYl009305 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 16 Jan 2012 16:06:52 -0500 Received: from psique ([10.3.112.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q0GL6llK001486 for ; Mon, 16 Jan 2012 16:06:50 -0500 From: Sergio Durigan Junior To: gdb-patches@sourceware.org Subject: [commit][obv] Remove dead code and reformat function prototype on parsers X-URL: http://www.redhat.com Date: Mon, 16 Jan 2012 22:31:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-01/txt/msg00578.txt.bz2 Hi, This has been discussed at http://sourceware.org/ml/gdb-patches/2012-01/msg00567.html. I committed the following patch. http://sourceware.org/ml/gdb-cvs/2012-01/msg00143.html Thanks. Sergio. 2012-01-16 Sergio Durigan Junior * f-exp.y (parse_number): Convert prototype from K&R to ANSI C. (growbuf_by_size): Likewise. (yyerror): Likewise. * m2-exp.y (make_qualname): Remove function (was #if 0'ed). (modblock): Remove variable (was #if 0'ed). (parse_number): Convert prototype from K&R to ANSI C. (yyerror): Likewise. * objc-exp.y (parse_number): Likewise. (yyerror): Likewise. (yylex): Remove #if 0'ed code. * p-exp.y (uptok): Convert prototype from K&R to ANSI C. (yyerror): Likewise. diff --git a/gdb/f-exp.y b/gdb/f-exp.y index fa464cf..b258c0a 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -664,11 +664,7 @@ name_not_typename : NAME /*** Needs some error checking for the float case ***/ static int -parse_number (p, len, parsed_float, putithere) - char *p; - int len; - int parsed_float; - YYSTYPE *putithere; +parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere) { LONGEST n = 0; LONGEST prevn = 0; @@ -895,8 +891,7 @@ static int tempbufindex; /* Current index into buffer */ first one on demand. */ static void -growbuf_by_size (count) - int count; +growbuf_by_size (int count) { int growby; @@ -1217,8 +1212,7 @@ yylex (void) } void -yyerror (msg) - char *msg; +yyerror (char *msg) { if (prev_lexptr) lexptr = prev_lexptr; diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y index ef9ec8e..af6c400 100644 --- a/gdb/m2-exp.y +++ b/gdb/m2-exp.y @@ -113,21 +113,11 @@ static int yylex (void); void yyerror (char *); -#if 0 -static char *make_qualname (char *, char *); -#endif - static int parse_number (int); /* The sign of the number being parsed. */ static int number_sign = 1; -/* The block that the module specified by the qualifer on an identifer is - contained in, */ -#if 0 -static struct block *modblock=0; -#endif - %} /* Although the yacc "value" of an expression is not used, @@ -665,8 +655,7 @@ type /*** Needs some error checking for the float case ***/ static int -parse_number (olen) - int olen; +parse_number (int olen) { char *p = lexptr; LONGEST n = 0; @@ -1076,22 +1065,8 @@ yylex (void) } } -#if 0 /* Unused */ -static char * -make_qualname(mod,ident) - char *mod, *ident; -{ - char *new = malloc(strlen(mod)+strlen(ident)+2); - - strcpy(new,mod); - strcat(new,"."); - strcat(new,ident); - return new; -} -#endif /* 0 */ - void -yyerror (msg) +yyerror (char *msg) char *msg; { if (prev_lexptr) diff --git a/gdb/objc-exp.y b/gdb/objc-exp.y index b43ba66..68b2a97 100644 --- a/gdb/objc-exp.y +++ b/gdb/objc-exp.y @@ -992,11 +992,7 @@ name_not_typename : NAME /*** Needs some error checking for the float case. ***/ static int -parse_number (p, len, parsed_float, putithere) - char *p; - int len; - int parsed_float; - YYSTYPE *putithere; +parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere) { /* FIXME: Shouldn't these be unsigned? We don't deal with negative values here, and we do kind of silly things like cast to @@ -1419,9 +1415,6 @@ yylex (void) case '^': case '~': case '!': -#if 0 - case '@': /* Moved out below. */ -#endif case '<': case '>': case '[': @@ -1783,8 +1776,7 @@ yylex (void) } void -yyerror (msg) - char *msg; +yyerror (char *msg) { if (*lexptr == '\0') error(_("A %s near end of expression."), (msg ? msg : "error")); diff --git a/gdb/p-exp.y b/gdb/p-exp.y index 7b05d58..4be3e6e 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -1093,9 +1093,8 @@ static const struct token tokentab2[] = /* Allocate uppercased var: */ /* make an uppercased copy of tokstart. */ -static char * uptok (tokstart, namelen) - char *tokstart; - int namelen; +static char * +uptok (char *tokstart, int namelen) { int i; char *uptokstart = (char *)malloc(namelen+1); @@ -1732,8 +1731,7 @@ yylex (void) } void -yyerror (msg) - char *msg; +yyerror (char *msg) { if (prev_lexptr) lexptr = prev_lexptr;