From: Zack Weinberg <zack@wolery.cumb.org>
Date: Tue, 2 May 2000 18:10:52 +0000 (+0000)
Subject: cpphash.c (collect_params): Fix off-by-one error.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ce4a39d078a6d0439df6cb17835f62dff57140f;p=gcc.git

cpphash.c (collect_params): Fix off-by-one error.

	* cpphash.c (collect_params): Fix off-by-one error.
	(dump_hash_helper): Dump all four macro nodetypes.

From-SVN: r33613
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c751b6fe49c..020031c0796 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-02  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* cpphash.c (collect_params): Fix off-by-one error.
+	(dump_hash_helper): Dump all four macro nodetypes.
+
 2000-05-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* cpphash.c (trad_stringify): Adjust p after stringification as
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 3fcd006962b..8684b65c6d5 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -804,7 +804,7 @@ collect_params (pfile, list, arglist)
 	argv[a].len = len;
 	argv[a].name = p;
 	argv[a].rest_arg = 0;
-	p += len;
+	p += len + 1;
 	a++;
 	break;
 
@@ -1934,7 +1934,8 @@ dump_hash_helper (h, p)
   HASHNODE *hp = (HASHNODE *)*h;
   cpp_reader *pfile = (cpp_reader *)p;
 
-  if (hp->type == T_MACRO)
+  if (hp->type == T_MACRO || hp->type == T_FMACRO
+      || hp->type == T_IDENTITY || hp->type == T_EMPTY)
     _cpp_dump_definition (pfile, hp);
   return 1;
 }