diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-05-06 04:00:38 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-05-06 04:00:38 +0000 |
| commit | d0d51277e27bdccd8fa3916b8a69c1afc1685645 (patch) | |
| tree | 0729570978d55aa8e9152738691e48fed7796ac9 /libgfortran | |
| parent | 1aee3ab6f3ee78281b71429bf2bc2613922fd4fb (diff) | |
| download | gcc-d0d51277e27bdccd8fa3916b8a69c1afc1685645.zip gcc-d0d51277e27bdccd8fa3916b8a69c1afc1685645.tar.gz gcc-d0d51277e27bdccd8fa3916b8a69c1afc1685645.tar.bz2 | |
re PR libfortran/36131 (wrong IO)
2008-05-05 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/36131
* io/transfer.c (formatted_transfer_scalar): Revert patch for PR34974.
(next_record_w): Likewise.
From-SVN: r134973
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 9da45d5..26ad039 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2008-05-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libfortran/36131 + * io/transfer.c (formatted_transfer_scalar): Revert patch for PR34974. + (next_record_w): Likewise. + 2008-05-04 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/35995 diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 8741758..7071ab9 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -1303,11 +1303,6 @@ formatted_transfer_scalar (st_parameter_dt *dtp, bt type, void *p, int len, else read_x (dtp, dtp->u.p.skips); } - else - { - if (dtp->u.p.skips < 0) - flush (dtp->u.p.current_unit->s); - } break; @@ -2682,8 +2677,7 @@ next_record_w (st_parameter_dt *dtp, int done) if (max_pos > m) { length = (int) (max_pos - m); - sseek (dtp->u.p.current_unit->s, - file_position (dtp->u.p.current_unit->s) + length); + p = salloc_w (dtp->u.p.current_unit->s, &length); } #ifdef HAVE_CRLF len = 2; |