+2006-03-30 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
+ PR libgfortran/26890
+ * io/io.h: Add size_used to st_parameter_dt, adjust pad size.
+ *io/transfer.c (data_transfer_init): Initialize size_used to zero.
+ (read_sf): Use size_used.
+ (read_block): Likewise.
+ (read_block_direct): Likewise.
+ (write_block): Likewise.
+ (write_buf): Likewise and eliminate erroneous FAILURE return.
+ (finalize_transfer): Assign value of size_used to *dtp->size.
+
2006-03-30 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR libfortran/26712
formatted field width. */
unsigned sf_read_comma : 1;
/* A namelist specific flag used to enable reading input from
- line_buffer for logical reads. */
+ line_buffer for logical reads. */
unsigned line_buffer_enabled : 1;
/* 18 unused bits. */
enough to hold a complex value (two reals) of the largest
kind. */
char value[32];
+ gfc_offset size_used;
} p;
- char pad[16 * sizeof (char *) + 34 * sizeof (int)];
+ char pad[16 * sizeof (char *) + 34 * sizeof (int) - sizeof (gfc_offset)];
} u;
}
st_parameter_dt;
dtp->u.p.current_unit->bytes_left -= *length;
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
- *dtp->size += *length;
+ dtp->u.p.size_used += (gfc_offset) *length;
return base;
}
source = salloc_r (dtp->u.p.current_unit->s, &nread);
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
- *dtp->size += nread;
+ dtp->u.p.size_used += (gfc_offset) nread;
if (nread != *length)
{ /* Short read, this shouldn't happen. */
}
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
- *dtp->size += (GFC_INTEGER_4) nread;
+ dtp->u.p.size_used += (gfc_offset) nread;
if (nread != *nbytes)
{ /* Short read, e.g. if we hit EOF. */
}
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
- *dtp->size += length;
+ dtp->u.p.size_used += (gfc_offset) length;
return dest;
}
}
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
- {
- *dtp->size += (GFC_INTEGER_4) nbytes;
- return FAILURE;
- }
+ dtp->u.p.size_used += (gfc_offset) nbytes;
return SUCCESS;
}
dtp->u.p.mode = read_flag ? READING : WRITING;
if ((cf & IOPARM_DT_HAS_SIZE) != 0)
- *dtp->size = 0; /* Initialize the count. */
+ dtp->u.p.size_used = 0; /* Initialize the count. */
dtp->u.p.current_unit = get_unit (dtp, 1);
if (dtp->u.p.current_unit->s == NULL)
jmp_buf eof_jump;
GFC_INTEGER_4 cf = dtp->common.flags;
+ if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
+ *dtp->size = (GFC_INTEGER_4) dtp->u.p.size_used;
+
if (dtp->u.p.eor_condition)
{
generate_error (&dtp->common, ERROR_EOR, NULL);