diff options
| author | Joseph Myers <jsm@polyomino.org.uk> | 2004-10-02 00:11:58 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2004-10-02 00:11:58 +0100 |
| commit | 36262a4c61961cd86c6d9b253774eccca5e49b58 (patch) | |
| tree | 60b9f2be4ee34d5f7d6b5b0525f8f9d3d86fcfdc | |
| parent | 5b022de53cab42a3f5a4637c595cddc155175a13 (diff) | |
| download | gcc-36262a4c61961cd86c6d9b253774eccca5e49b58.zip gcc-36262a4c61961cd86c6d9b253774eccca5e49b58.tar.gz gcc-36262a4c61961cd86c6d9b253774eccca5e49b58.tar.bz2 | |
* c-typeck.c (warn_for_assignment): Don't permit argnum == 0.
From-SVN: r88412
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 25 |
2 files changed, 7 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9e3acb9..3f32ba4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-10-02 Joseph S. Myers <jsm@polyomino.org.uk> + + * c-typeck.c (warn_for_assignment): Don't permit argnum == 0. + 2004-10-01 Ulrich Weigand <uweigand@de.ibm.com> * config/s390/s390-protos.h (s390_comparison): Add prototype. diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 70d3938..08b5953 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -3720,8 +3720,7 @@ c_convert_parm_for_inlining (tree parm, tree value, tree fn, int argnum) /* Print a warning using MSGID. It gets OPNAME as its one parameter. - if OPNAME is null and ARGNUM is 0, it is replaced by "passing arg of `FUNCTION'". - Otherwise if OPNAME is null, it is replaced by "passing arg ARGNUM of `FUNCTION'". + If OPNAME is null, it is replaced by "passing arg ARGNUM of 'FUNCTION'". FUNCTION and ARGNUM are handled specially if we are building an Objective-C selector. */ @@ -3739,26 +3738,8 @@ warn_for_assignment (const char *msgid, const char *opname, tree function, function = selector; argnum -= 2; } - if (argnum == 0) - { - if (function) - { - /* Function name is known; supply it. */ - const char *const argstring = _("passing arg of '%s'"); - new_opname = (char *) alloca (IDENTIFIER_LENGTH (function) - + strlen (argstring) + 1 + 1); - sprintf (new_opname, argstring, - IDENTIFIER_POINTER (function)); - } - else - { - /* Function name unknown (call through ptr). */ - const char *const argnofun = _("passing arg of pointer to function"); - new_opname = (char *) alloca (strlen (argnofun) + 1 + 1); - sprintf (new_opname, argnofun); - } - } - else if (function) + gcc_assert (argnum > 0); + if (function) { /* Function name is known; supply it. */ const char *const argstring = _("passing arg %d of '%s'"); |