Message ID | 0c22b334-a74e-3a87-8fdf-4fcabac112fe@charter.net |
---|---|
State | New |
Headers | show |
Series | [libgfortran] Fix warning about mismatched type declarations. | expand |
Hi Jerry, > > The subject patch fixes the declaration for the vlist argument of the > formatted_dtio function pointer definition which currently gives a > warnings during compilation for mismatched types. > > Regression tested on x86_64-pc-linux. > > OK for trunk? OK. Thanks! Regards Thomas
On 09/02/2018 04:49 AM, Thomas Koenig wrote: > Hi Jerry, > >> >> The subject patch fixes the declaration for the vlist argument of the >> formatted_dtio function pointer definition which currently gives a >> warnings during compilation for mismatched types. >> >> Regression tested on x86_64-pc-linux. >> >> OK for trunk? > > OK. Thanks! > > Regards > > Thomas > Committing to svn+ssh://jvdelisle@gcc.gnu.org/svn/gcc/trunk ... M libgfortran/ChangeLog M libgfortran/io/format.c M libgfortran/io/format.h M libgfortran/io/io.h Committed r264043
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c index b4920aaf1f1..f5d3158d21d 100644 --- a/libgfortran/io/format.c +++ b/libgfortran/io/format.c @@ -1058,7 +1058,7 @@ parse_format_list (st_parameter_dt *dtp, bool *seen_dd) { /* We have parsed the complete vlist so initialize the array descriptor and save it in the format node. */ - gfc_array_i4 *vp = tail->u.udf.vlist; + gfc_full_array_i4 *vp = tail->u.udf.vlist; GFC_DESCRIPTOR_DATA(vp) = xmalloc (i * sizeof(GFC_INTEGER_4)); GFC_DIMENSION_SET(vp->dim[0],1, i, 1); memcpy (GFC_DESCRIPTOR_DATA(vp), temp, i * sizeof(GFC_INTEGER_4)); diff --git a/libgfortran/io/format.h b/libgfortran/io/format.h index ad7e1c14b8f..19882bcf095 100644 --- a/libgfortran/io/format.h +++ b/libgfortran/io/format.h @@ -78,7 +78,7 @@ struct fnode { char *string; int string_len; - gfc_array_i4 *vlist; + gfc_full_array_i4 *vlist; } udf; /* User Defined Format. */ diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index d31213106ed..902eb412848 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -100,7 +100,8 @@ array_loop_spec; /* Subroutine formatted_dtio (struct, unit, iotype, v_list, iostat, iomsg, (_iotype), (_iomsg)) */ -typedef void (*formatted_dtio)(void *, GFC_INTEGER_4 *, char *, gfc_array_i4 *, +typedef void (*formatted_dtio)(void *, GFC_INTEGER_4 *, char *, + gfc_full_array_i4 *, GFC_INTEGER_4 *, char *, gfc_charlen_type, gfc_charlen_type);