From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5809 invoked by alias); 26 Jul 2012 18:40:37 -0000 Received: (qmail 5801 invoked by uid 22791); 26 Jul 2012 18:40:35 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,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; Thu, 26 Jul 2012 18:40:21 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6QIdpEN030827 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Jul 2012 14:40:21 -0400 Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6QHKe8L008783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 26 Jul 2012 13:20:41 -0400 From: Tom Tromey To: Jan Kratochvil Cc: gdb-patches@sourceware.org, Doug Evans Subject: Re: [patch] Remove one immediate_quit++-- (in auto-load.c) References: <20120726135446.GA15749@host2.jankratochvil.net> <87boj2folm.fsf@fleche.redhat.com> Date: Thu, 26 Jul 2012 18:40:00 -0000 In-Reply-To: <87boj2folm.fsf@fleche.redhat.com> (Tom Tromey's message of "Thu, 26 Jul 2012 10:56:21 -0600") Message-ID: <87394efnh3.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-07/txt/msg00637.txt.bz2 >>>>> "Tom" == Tom Tromey writes: Tom> - printf_filtered (" Copyright (C) 2007 Free Software Foundation, Inc. \n"); Tom> + printf_filtered (" Copyright (C) 2007, 2012 Free Software Foundation, Inc. \n"); Pedro pointed out that I put this in by mistake. Sigh. And then, double sigh, I noticed: /* ==> Do not modify this file!! It is created automatically by copying.awk. Modify copying.awk instead. <== */ Then, when fixing this, I noticed that there was a previous change to copying.c that wasn't first done in copying.awk. So, I fixed that as well. Here's the patch. Tom 2012-07-26 Tom Tromey * copying.c: Rebuild. * copying.awk: Don't use immediate_quit. Use 'no_set_class', not 'no_class'. Index: copying.awk =================================================================== RCS file: /cvs/src/src/gdb/copying.awk,v retrieving revision 1.4 diff -u -r1.4 copying.awk --- copying.awk 23 Aug 2007 20:33:48 -0000 1.4 +++ copying.awk 26 Jul 2012 17:19:57 -0000 @@ -13,11 +13,9 @@ print "" print "void _initialize_copying (void);" print "" - print "extern int immediate_quit;"; print "static void"; print "show_copying_command (char *ignore, int from_tty)"; print "{"; - print " immediate_quit++;"; } NR == 1,/^[ ]*15\. Disclaimer of Warranty\.[ ]*$/ { if ($0 ~ / /) @@ -33,13 +31,11 @@ } } /^[ ]*15\. Disclaimer of Warranty\.[ ]*$/ { - print " immediate_quit--;"; print "}"; print ""; print "static void"; print "show_warranty_command (char *ignore, int from_tty)"; print "{"; - print " immediate_quit++;"; } /^[ ]*15\. Disclaimer of Warranty\.[ ]*$/, /^[ ]*END OF TERMS AND CONDITIONS[ ]*$/{ if (! ($0 ~ /^[ ]*END OF TERMS AND CONDITIONS[ ]*$/)) @@ -51,16 +47,15 @@ } } END { - print " immediate_quit--;"; print "}"; print ""; print "void" print "_initialize_copying (void)"; print "{"; - print " add_cmd (\"copying\", no_class, show_copying_command,"; + print " add_cmd (\"copying\", no_set_class, show_copying_command,"; print " _(\"Conditions for redistributing copies of GDB.\"),"; print " &showlist);"; - print " add_cmd (\"warranty\", no_class, show_warranty_command,"; + print " add_cmd (\"warranty\", no_set_class, show_warranty_command,"; print " _(\"Various kinds of warranty you do not have.\"),"; print " &showlist);"; print ""; Index: copying.c =================================================================== RCS file: /cvs/src/src/gdb/copying.c,v retrieving revision 1.8 diff -u -r1.8 copying.c --- copying.c 26 Jul 2012 16:57:21 -0000 1.8 +++ copying.c 26 Jul 2012 17:19:57 -0000 @@ -17,7 +17,7 @@ printf_filtered (" GNU GENERAL PUBLIC LICENSE\n"); printf_filtered (" Version 3, 29 June 2007\n"); printf_filtered ("\n"); - printf_filtered (" Copyright (C) 2007, 2012 Free Software Foundation, Inc. \n"); + printf_filtered (" Copyright (C) 2007 Free Software Foundation, Inc. \n"); printf_filtered (" Everyone is permitted to copy and distribute verbatim copies\n"); printf_filtered (" of this license document, but changing it is not allowed.\n"); printf_filtered ("\n");