Re: [patch] Remove one immediate_quit++-- (in auto-load.c)

[Tom Tromey <tromey at redhat dot com>]

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Tom> -  printf_filtered (" Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n");
Tom> +  printf_filtered (" Copyright (C) 2007, 2012 Free Software Foundation, Inc. <http://fsf.org/>\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  <tromey@redhat.com>

	* 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. <http://fsf.org/>\n");
+  printf_filtered (" Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\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");