From: Richard Kenner <kenner@gcc.gnu.org>
Date: Mon, 9 Jun 1997 13:09:05 +0000 (-0400)
Subject: (check_format_info): Correct handling of the 'a' flag which adds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9dcab5273c6957efd1249ab66bbb63ef86edf38;p=gcc.git

(check_format_info): Correct handling of the 'a' flag which adds
another pointer level.

From-SVN: r14176
---

diff --git a/gcc/c-common.c b/gcc/c-common.c
index d921661578e..8b6d9f3133a 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -1,5 +1,5 @@
 /* Subroutines shared by all languages that are variants of C.
-   Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -1396,6 +1396,8 @@ check_format_info (info, params)
 	  sprintf (message, "`a' flag used with `%c' format",
 		   format_char);
 	  warning (message);
+	  /* To simplify the following code.  */
+	  aflag = 0;
 	}
       if (info->is_scan && format_char == '[')
 	{
@@ -1485,7 +1487,7 @@ check_format_info (info, params)
 
       /* Check the types of any additional pointer arguments
 	 that precede the "real" argument.  */
-      for (i = 0; i < fci->pointer_count; ++i)
+      for (i = 0; i < fci->pointer_count + aflag; ++i)
 	{
 	  if (TREE_CODE (cur_type) == POINTER_TYPE)
 	    {
@@ -1496,7 +1498,8 @@ check_format_info (info, params)
 	    {
 	      sprintf (message,
 		       "format argument is not a %s (arg %d)",
-		       ((fci->pointer_count == 1) ? "pointer" : "pointer to a pointer"),
+		       ((fci->pointer_count + aflag == 1)
+			? "pointer" : "pointer to a pointer"),
 		       arg_num);
 	      warning (message);
 	    }
@@ -1504,7 +1507,7 @@ check_format_info (info, params)
 	}
 
       /* Check the type of the "real" argument, if there's a type we want.  */
-      if (i == fci->pointer_count && wanted_type != 0
+      if (i == fci->pointer_count + aflag && wanted_type != 0
 	  && TREE_CODE (cur_type) != ERROR_MARK
 	  && wanted_type != TYPE_MAIN_VARIANT (cur_type)
 	  /* If we want `void *', allow any pointer type.