From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Thu, 27 Jun 2002 01:03:24 +0000 (+0000)
Subject: lex.c (java_init_lex): Avoid incorrect hardcoded constant 11.
X-Git-Tag: releases/gcc-3.3.0~4090
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57ddd19c61a3db3afb0cf15d06efca966d4500ea;p=thirdparty%2Fgcc.git

lex.c (java_init_lex): Avoid incorrect hardcoded constant 11.

	* lex.c (java_init_lex): Avoid incorrect hardcoded constant 11.
	* parse.y (mark_parser_ctxt): Likewise.

From-SVN: r55016
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e7a82e451bbf..fe89b75b5918 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,8 @@
 2002-06-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+	* lex.c (java_init_lex): Avoid incorrect hardcoded constant 11.
+	* parse.y (mark_parser_ctxt): Likewise.
+
 	* lex.c (java_read_char): Avoid "comparison is always true"
 	warning.
 
diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 3810096e15d3..d350e99907a7 100644
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -128,7 +128,7 @@ java_init_lex (finput, encoding)
   CPC_INITIALIZER_LIST (ctxp) = CPC_STATIC_INITIALIZER_LIST (ctxp) =
     CPC_INSTANCE_INITIALIZER_LIST (ctxp) = NULL_TREE;
 
-  memset ((PTR) ctxp->modifier_ctx, 0, 11*sizeof (ctxp->modifier_ctx[0]));
+  memset ((PTR) ctxp->modifier_ctx, 0, sizeof (ctxp->modifier_ctx));
   memset ((PTR) current_jcf, 0, sizeof (JCF));
   ctxp->current_parsed_class = NULL;
   ctxp->package = NULL_TREE;
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 7f373846aabd..f0647821ee13 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -16148,13 +16148,15 @@ mark_parser_ctxt (p)
      void *p;
 {
   struct parser_ctxt *pc = *((struct parser_ctxt **) p);
-  int i;
+#ifndef JC1_LITE
+  size_t i;
+#endif
 
   if (!pc)
     return;
 
 #ifndef JC1_LITE
-  for (i = 0; i < 11; ++i)
+  for (i = 0; i < ARRAY_SIZE (pc->modifier_ctx); ++i)
     ggc_mark_tree (pc->modifier_ctx[i]);
   ggc_mark_tree (pc->class_type);
   ggc_mark_tree (pc->function_decl);