* gcc.c (validate_switches): Don't scan past closing '}'.

From-SVN: r63046

gcc/ChangeLog

+2003-02-18  Geoffrey Keating  <geoffk@apple.com>
+
+	* gcc.c (validate_switches): Don't scan past closing '}'.
+
 2003-02-18  Ben Elliston  <bje@redhat.com>
 
 	PR c++/1607

gcc/cp/ChangeLog

+2003-02-18  Geoffrey Keating  <geoffk@apple.com>
+
+	* cp-tree.h (rid_to_yy): Delete.
+	(C_RID_YYCODE): Delete.
+	(finish_file): Delete redundant declaration.
+
 2003-02-18  Jason Merrill  <jason@redhat.com>
 
 	PR c++/9623

gcc/cp/cp-tree.h

@@ -240,9 +240,6 @@ struct lang_identifier GTY(())
 
 #define C_IS_RESERVED_WORD(ID) TREE_LANG_FLAG_5 (ID)
 
-extern const short rid_to_yy[RID_MAX];
-#define C_RID_YYCODE(ID) rid_to_yy[C_RID_CODE (ID)]
-
 #define LANG_IDENTIFIER_CAST(NODE) \
 	((struct lang_identifier*)IDENTIFIER_NODE_CHECK (NODE))
 
@@ -3886,7 +3883,6 @@ extern tree build_cleanup			(tree);
 extern void finish_file				(void);
 extern tree build_expr_from_tree		(tree);
 extern tree build_cleanup			(tree);
-extern void finish_file				(void);
 extern tree build_expr_from_tree		(tree);
 extern tree build_offset_ref_call_from_tree     (tree, tree);
 extern tree build_call_from_tree                (tree, tree, bool);

gcc/gcc.c

@@ -6871,7 +6871,8 @@ next_member:
 	      else if (p[0] == 'W' && p[1] == '{')
 		p = validate_switches (p+2);
 	    }
-	  if (*p) p++;
+	  else
+	    p++;
 	}
 
       if (*p) p++;