git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/43899 (Wrong unused-variable warning with NAMELISTs) 

2010-11-03  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/43899
	* runtime/error.c (generate_warning): New function to generate a run
	time warning message. Fix some whitespace.
	* libgfortran.h: Add prototype for new function.
	* io/list_read.c (nml_read_obj): Use new function to warn when a
	character namelist object is truncated.  Only warn if compiled
	with -fbounds-check.

From-SVN: r166252
This commit is contained in:
Jerry DeLisle 2010-11-03 15:22:25 +00:00
parent 23782cc378
commit fc5f5bb770
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libgfortran/ChangeLog
View File

@ -1,3 +1,13 @@
2010-11-03 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/43899
* runtime/error.c (generate_warning): New function to generate a run
time warning message. Fix some whitespace.
* libgfortran.h: Add prototype for new function.
* io/list_read.c (nml_read_obj): Use new function to warn when a
character namelist object is truncated. Only warn if compiled
with -fbounds-check.
2010-11-02 Janne Blomqvist <jb@gcc.gnu.org> 2010-11-02 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/45629 PR libfortran/45629

14
libgfortran/io/list_read.c
View File

@ -2586,7 +2586,19 @@ nml_read_obj (st_parameter_dt *dtp, namelist_info * nl, index_type offset,
break; break;
case BT_CHARACTER: case BT_CHARACTER:
m = (dlen < dtp->u.p.saved_used) ? dlen : dtp->u.p.saved_used; if (dlen < dtp->u.p.saved_used)
{
if (compile_options.bounds_check)
{
snprintf (nml_err_msg, nml_err_msg_size,
"Namelist object '%s' truncated on read.",
nl->var_name);
generate_warning (&dtp->common, nml_err_msg);
}
m = dlen;
}
else
m = dtp->u.p.saved_used;
pdata = (void*)( pdata + clow - 1 ); pdata = (void*)( pdata + clow - 1 );
memcpy (pdata, dtp->u.p.saved_string, m); memcpy (pdata, dtp->u.p.saved_string, m);
if (m < dlen) if (m < dlen)

3
libgfortran/libgfortran.h
View File

@ -733,6 +733,9 @@ internal_proto(translate_error);
extern void generate_error (st_parameter_common *, int, const char *); extern void generate_error (st_parameter_common *, int, const char *);
iexport_proto(generate_error); iexport_proto(generate_error);
extern void generate_warning (st_parameter_common *, const char *);
internal_proto(generate_warning);
extern try notify_std (st_parameter_common *, int, const char *); extern try notify_std (st_parameter_common *, int, const char *);
internal_proto(notify_std); internal_proto(notify_std);

15
libgfortran/runtime/error.c
View File

@ -443,6 +443,20 @@ generate_error (st_parameter_common *cmp, int family, const char *message)
} }
iexport(generate_error); iexport(generate_error);
/* generate_warning()-- Similar to generate_error but just give a warning. */
void
generate_warning (st_parameter_common *cmp, const char *message)
{
if (message == NULL)
message = " ";
show_locus (cmp);
st_printf ("Fortran runtime warning: %s\n", message);
}
/* Whether, for a feature included in a given standard set (GFC_STD_*), /* Whether, for a feature included in a given standard set (GFC_STD_*),
we should issue an error or a warning, or be quiet. */ we should issue an error or a warning, or be quiet. */
@ -462,7 +476,6 @@ notification_std (int std)
} }
/* Possibly issue a warning/error about use of a nonstandard (or deleted) /* Possibly issue a warning/error about use of a nonstandard (or deleted)
feature. An error/warning will be issued if the currently selected feature. An error/warning will be issued if the currently selected
standard does not contain the requested bits. */ standard does not contain the requested bits. */