diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-01-13 21:53:16 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-01-13 21:53:16 +0200 |
| commit | c1e9bbcc49c1b9f169c5911f3871f5df109bff9b (patch) | |
| tree | bf815e2471d2b7f7e44d76a31e98cc1d05e07b34 /libgfortran/io | |
| parent | be4aa83d6ff4720fffd2c9f62c6e3082ece1937f (diff) | |
| download | gcc-c1e9bbcc49c1b9f169c5911f3871f5df109bff9b.zip gcc-c1e9bbcc49c1b9f169c5911f3871f5df109bff9b.tar.gz gcc-c1e9bbcc49c1b9f169c5911f3871f5df109bff9b.tar.bz2 | |
Revert r244448
From-SVN: r244454
Diffstat (limited to 'libgfortran/io')
| -rw-r--r-- | libgfortran/io/transfer.c | 18 | ||||
| -rw-r--r-- | libgfortran/io/unit.c | 3 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 9724ccb..b47f4e0 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -93,17 +93,17 @@ export_proto(transfer_logical); extern void transfer_logical_write (st_parameter_dt *, void *, int); export_proto(transfer_logical_write); -extern void transfer_character (st_parameter_dt *, void *, gfc_charlen_type); +extern void transfer_character (st_parameter_dt *, void *, int); export_proto(transfer_character); -extern void transfer_character_write (st_parameter_dt *, void *, gfc_charlen_type); +extern void transfer_character_write (st_parameter_dt *, void *, int); export_proto(transfer_character_write); -extern void transfer_character_wide (st_parameter_dt *, void *, gfc_charlen_type, int); +extern void transfer_character_wide (st_parameter_dt *, void *, int, int); export_proto(transfer_character_wide); extern void transfer_character_wide_write (st_parameter_dt *, - void *, gfc_charlen_type, int); + void *, int, int); export_proto(transfer_character_wide_write); extern void transfer_complex (st_parameter_dt *, void *, int); @@ -2272,7 +2272,7 @@ transfer_logical_write (st_parameter_dt *dtp, void *p, int kind) } void -transfer_character (st_parameter_dt *dtp, void *p, gfc_charlen_type len) +transfer_character (st_parameter_dt *dtp, void *p, int len) { static char *empty_string[0]; @@ -2290,13 +2290,13 @@ transfer_character (st_parameter_dt *dtp, void *p, gfc_charlen_type len) } void -transfer_character_write (st_parameter_dt *dtp, void *p, gfc_charlen_type len) +transfer_character_write (st_parameter_dt *dtp, void *p, int len) { transfer_character (dtp, p, len); } void -transfer_character_wide (st_parameter_dt *dtp, void *p, gfc_charlen_type len, int kind) +transfer_character_wide (st_parameter_dt *dtp, void *p, int len, int kind) { static char *empty_string[0]; @@ -2314,7 +2314,7 @@ transfer_character_wide (st_parameter_dt *dtp, void *p, gfc_charlen_type len, in } void -transfer_character_wide_write (st_parameter_dt *dtp, void *p, gfc_charlen_type len, int kind) +transfer_character_wide_write (st_parameter_dt *dtp, void *p, int len, int kind) { transfer_character_wide (dtp, p, len, kind); } @@ -2351,7 +2351,7 @@ transfer_array (st_parameter_dt *dtp, gfc_array_char *desc, int kind, return; iotype = (bt) GFC_DESCRIPTOR_TYPE (desc); - size = iotype == BT_CHARACTER ? (index_type) charlen : GFC_DESCRIPTOR_SIZE (desc); + size = iotype == BT_CHARACTER ? charlen : GFC_DESCRIPTOR_SIZE (desc); rank = GFC_DESCRIPTOR_RANK (desc); for (n = 0; n < rank; n++) diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c index 2bd40e4..ed3bc32 100644 --- a/libgfortran/io/unit.c +++ b/libgfortran/io/unit.c @@ -439,9 +439,10 @@ is_trim_ok (st_parameter_dt *dtp) if (dtp->common.flags & IOPARM_DT_HAS_FORMAT) { char *p = dtp->format; + off_t i; if (dtp->common.flags & IOPARM_DT_HAS_BLANK) return false; - for (gfc_charlen_type i = 0; i < dtp->format_len; i++) + for (i = 0; i < dtp->format_len; i++) { if (p[i] == '/') return false; if (p[i] == 'b' || p[i] == 'B') diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 86836df..47970d4 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -2380,6 +2380,7 @@ void namelist_write (st_parameter_dt *dtp) { namelist_info * t1, *t2, *dummy = NULL; + index_type i; index_type dummy_offset = 0; char c; char * dummy_name = NULL; @@ -2401,7 +2402,7 @@ namelist_write (st_parameter_dt *dtp) write_character (dtp, "&", 1, 1, NODELIM); /* Write namelist name in upper case - f95 std. */ - for (gfc_charlen_type i = 0; i < dtp->namelist_name_len; i++ ) + for (i = 0 ;i < dtp->namelist_name_len ;i++ ) { c = toupper ((int) dtp->namelist_name[i]); write_character (dtp, &c, 1 ,1, NODELIM); |