io.h: Change declaration of vlist type to gfc_full_array_i4 to eliminate warning...

2018-09-01  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	* io/io.h: Change declaration of vlist type to
	gfc_full_array_i4 to eliminate warning for mismatched type.
	* io/format.c ((parse_format_list): Use gfc_full_array_i4.
	* io/io.h: Use gfc_full_array_i4.

From-SVN: r264043

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 76228e26b693b795a0406811a7187cae0849a7b7..ca5e7b91a95b15522e0b41ce06d2c4b0871cd4b8 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-01  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       * io/io.h: Change declaration of vlist type to
+       gfc_full_array_i4 to eliminate warning for mismatched type.
+       * io/format.c ((parse_format_list): Use gfc_full_array_i4.
+       * io/io.h: Use gfc_full_array_i4.
+
 2018-08-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR libfortran/86704

diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index b4920aaf1f1f8d848e6c72de9e06ba9674ac76a6..f5d3158d21d8b50f08f966597be22ee09fae0a43 100644 (file)
--- 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 ad7e1c14b8fb4f32d509fd36dfd518aef29cefec..19882bcf095c47583603580551a3f5efd8e1e419 100644 (file)
--- 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 d31213106edaf23f89937d30ff7eb83963e4b74f..902eb4128489905aa518784acc96b8fc7f4bd786 100644 (file)
--- 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);