diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 14 | ||||
| -rw-r--r-- | libgfortran/io/backspace.c | 8 | ||||
| -rw-r--r-- | libgfortran/io/io.h | 14 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 28 | ||||
| -rw-r--r-- | libgfortran/io/unit.c | 6 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 48 | ||||
| -rw-r--r-- | libgfortran/libgfortran.h | 2 |
7 files changed, 67 insertions, 53 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 4612664..09f7427 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,17 @@ +2004-05-18 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + PR fortran/15235 + * gfortran.h (offset_t): Rename to ... + (gfc_offset): ... this. + * io/backspace.c (formatted_backspace, unformatted_backspace), + io/io.h (stream, gfc_unit, global_t, file_length, file_position), + transfer.c (us_read, us_write, next_record_r, next_record_w), + io/unit.c (init_units), unix.c (unix_stream, fd_alloc, + fd_alloc_r_at, fd_alloc_w_at, fd_seek, mmap_alloc, + mmap_alloc_r_at, mmap_alloc_w_at, mmap_seek, mem_alloc_r_at, + mem_alloc_w_at, mem_seek, file_length, file_position): Replace all + occurences of offset_t by gfc_offset. + 2004-05-16 Paul Brook <paul@codesourcery.com> * io/format.c (write_real): Don't include padding in format. diff --git a/libgfortran/io/backspace.c b/libgfortran/io/backspace.c index 5cfc43c..aff4c5e 100644 --- a/libgfortran/io/backspace.c +++ b/libgfortran/io/backspace.c @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ static void formatted_backspace (void) { - offset_t base; + gfc_offset base; char *p; int n; @@ -92,12 +92,12 @@ io_error: static void unformatted_backspace (void) { - offset_t *p, new; + gfc_offset *p, new; int length; - length = sizeof (offset_t); + length = sizeof (gfc_offset); - p = (offset_t *) salloc_r_at (current_unit->s, &length, + p = (gfc_offset *) salloc_r_at (current_unit->s, &length, file_position (current_unit->s) - length); if (p == NULL) goto io_error; diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index 1806fb9..7658ec8 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -42,11 +42,11 @@ try; typedef struct stream { - char *(*alloc_w_at) (struct stream *, int *, offset_t); - char *(*alloc_r_at) (struct stream *, int *, offset_t); + char *(*alloc_w_at) (struct stream *, int *, gfc_offset); + char *(*alloc_r_at) (struct stream *, int *, gfc_offset); try (*sfree) (struct stream *); try (*close) (struct stream *); - try (*seek) (struct stream *, offset_t); + try (*seek) (struct stream *, gfc_offset); try (*truncate) (struct stream *); } stream; @@ -269,7 +269,7 @@ typedef struct gfc_unit endfile; unit_flags flags; - offset_t recl, last_record, maxrec, bytes_left; + gfc_offset recl, last_record, maxrec, bytes_left; /* recl -- Record length of the file. last_record -- Last record number read or written @@ -288,7 +288,7 @@ typedef struct { int in_library; /* Nonzero if a library call is being processed. */ int size; /* Bytes processed by the current data-transfer statement. */ - offset_t max_offset; /* Maximum file offset. */ + gfc_offset max_offset; /* Maximum file offset. */ int item_count; /* Item number in a formatted data transfer. */ int reversion_flag; /* Format reversion has occurred. */ int first_item; @@ -445,10 +445,10 @@ const char *inquire_write (const char *, int); const char *inquire_readwrite (const char *, int); #define file_length prefix(file_length) -offset_t file_length (stream *); +gfc_offset file_length (stream *); #define file_position prefix(file_position) -offset_t file_position (stream *); +gfc_offset file_position (stream *); #define is_seekable prefix(is_seekable) int is_seekable (stream *); diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index da2e615..d5ef5c6 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -792,13 +792,13 @@ transfer_complex (void *p, int kind) static void us_read (void) { - offset_t *p; + gfc_offset *p; int n; - n = sizeof (offset_t); - p = (offset_t *) salloc_r (current_unit->s, &n); + n = sizeof (gfc_offset); + p = (gfc_offset *) salloc_r (current_unit->s, &n); - if (p == NULL || n != sizeof (offset_t)) + if (p == NULL || n != sizeof (gfc_offset)) { generate_error (ERROR_BAD_US, NULL); return; @@ -815,11 +815,11 @@ us_read (void) static void us_write (void) { - offset_t *p; + gfc_offset *p; int length; - length = sizeof (offset_t); - p = (offset_t *) salloc_w (current_unit->s, &length); + length = sizeof (gfc_offset); + p = (gfc_offset *) salloc_w (current_unit->s, &length); if (p == NULL) { @@ -1111,13 +1111,13 @@ static void next_record_r (int done) { int rlength, length; - offset_t new; + gfc_offset new; char *p; switch (current_mode ()) { case UNFORMATTED_SEQUENTIAL: - current_unit->bytes_left += sizeof (offset_t); /* Skip over tail */ + current_unit->bytes_left += sizeof (gfc_offset); /* Skip over tail */ /* Fall through */ @@ -1198,7 +1198,7 @@ next_record_r (int done) static void next_record_w (int done) { - offset_t c, m; + gfc_offset c, m; int length; char *p; @@ -1225,7 +1225,7 @@ next_record_w (int done) m = current_unit->recl - current_unit->bytes_left; /* Bytes written */ c = file_position (current_unit->s); - length = sizeof (offset_t); + length = sizeof (gfc_offset); /* Write the length tail */ @@ -1233,7 +1233,7 @@ next_record_w (int done) if (p == NULL) goto io_error; - *((offset_t *) p) = m; + *((gfc_offset *) p) = m; if (sfree (current_unit->s) == FAILURE) goto io_error; @@ -1243,13 +1243,13 @@ next_record_w (int done) if (p == NULL) generate_error (ERROR_OS, NULL); - *((offset_t *) p) = m; + *((gfc_offset *) p) = m; if (sfree (current_unit->s) == FAILURE) goto io_error; /* Seek past the end of the current record */ - if (sseek (current_unit->s, c + sizeof (offset_t)) == FAILURE) + if (sseek (current_unit->s, c + sizeof (gfc_offset)) == FAILURE) goto io_error; break; diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c index 6f35a21..c3d6e7e 100644 --- a/libgfortran/io/unit.c +++ b/libgfortran/io/unit.c @@ -289,7 +289,7 @@ is_internal_unit () void init_units (void) { - offset_t m, n; + gfc_offset m, n; gfc_unit *u; int i; @@ -336,13 +336,13 @@ init_units (void) } /* Calculate the maximum file offset in a portable manner. - * max will be the largest signed number for the type offset_t. + * max will be the largest signed number for the type gfc_offset. * * set a 1 in the LSB and keep a running sum, stopping at MSB-1 bit. */ g.max_offset = 0; for (i=0; i < sizeof(g.max_offset) * 8 - 1; i++) - g.max_offset = g.max_offset + ((offset_t) 1 << i); + g.max_offset = g.max_offset + ((gfc_offset) 1 << i); } diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index 104afb2c..fc25395 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -86,11 +86,11 @@ typedef struct stream st; int fd; - offset_t buffer_offset; /* File offset of the start of the buffer */ - offset_t physical_offset; /* Current physical file offset */ - offset_t logical_offset; /* Current logical file offset */ - offset_t dirty_offset; /* Start of modified bytes in buffer */ - offset_t file_length; /* Length of the file, -1 if not seekable. */ + gfc_offset buffer_offset; /* File offset of the start of the buffer */ + gfc_offset physical_offset; /* Current physical file offset */ + gfc_offset logical_offset; /* Current logical file offset */ + gfc_offset dirty_offset; /* Start of modified bytes in buffer */ + gfc_offset file_length; /* Length of the file, -1 if not seekable. */ char *buffer; int len; /* Physical length of the current buffer */ @@ -293,7 +293,7 @@ fd_flush (unix_stream * s) * to come next. */ static void -fd_alloc (unix_stream * s, offset_t where, int *len) +fd_alloc (unix_stream * s, gfc_offset where, int *len) { char *new_buffer; int n, read_len; @@ -344,9 +344,9 @@ fd_alloc (unix_stream * s, offset_t where, int *len) * NULL on I/O error. */ static char * -fd_alloc_r_at (unix_stream * s, int *len, offset_t where) +fd_alloc_r_at (unix_stream * s, int *len, gfc_offset where) { - offset_t m; + gfc_offset m; int n; if (where == -1) @@ -389,9 +389,9 @@ fd_alloc_r_at (unix_stream * s, int *len, offset_t where) * we've already buffered the data or we need to load it. */ static char * -fd_alloc_w_at (unix_stream * s, int *len, offset_t where) +fd_alloc_w_at (unix_stream * s, int *len, gfc_offset where) { - offset_t n; + gfc_offset n; if (where == -1) where = s->logical_offset; @@ -444,7 +444,7 @@ fd_sfree (unix_stream * s) static int -fd_seek (unix_stream * s, offset_t offset) +fd_seek (unix_stream * s, gfc_offset offset) { s->physical_offset = s->logical_offset = offset; @@ -551,9 +551,9 @@ mmap_flush (unix_stream * s) * guaranteed to be mappable. */ static try -mmap_alloc (unix_stream * s, offset_t where, int *len) +mmap_alloc (unix_stream * s, gfc_offset where, int *len) { - offset_t offset; + gfc_offset offset; int length; char *p; @@ -578,9 +578,9 @@ mmap_alloc (unix_stream * s, offset_t where, int *len) static char * -mmap_alloc_r_at (unix_stream * s, int *len, offset_t where) +mmap_alloc_r_at (unix_stream * s, int *len, gfc_offset where) { - offset_t m; + gfc_offset m; if (where == -1) where = s->logical_offset; @@ -605,7 +605,7 @@ mmap_alloc_r_at (unix_stream * s, int *len, offset_t where) static char * -mmap_alloc_w_at (unix_stream * s, int *len, offset_t where) +mmap_alloc_w_at (unix_stream * s, int *len, gfc_offset where) { if (where == -1) where = s->logical_offset; @@ -632,7 +632,7 @@ mmap_alloc_w_at (unix_stream * s, int *len, offset_t where) static int -mmap_seek (unix_stream * s, offset_t offset) +mmap_seek (unix_stream * s, gfc_offset offset) { s->logical_offset = offset; @@ -719,9 +719,9 @@ mmap_open (unix_stream * s) static char * -mem_alloc_r_at (unix_stream * s, int *len, offset_t where) +mem_alloc_r_at (unix_stream * s, int *len, gfc_offset where) { - offset_t n; + gfc_offset n; if (where == -1) where = s->logical_offset; @@ -743,9 +743,9 @@ mem_alloc_r_at (unix_stream * s, int *len, offset_t where) static char * -mem_alloc_w_at (unix_stream * s, int *len, offset_t where) +mem_alloc_w_at (unix_stream * s, int *len, gfc_offset where) { - offset_t m; + gfc_offset m; if (where == -1) where = s->logical_offset; @@ -762,7 +762,7 @@ mem_alloc_w_at (unix_stream * s, int *len, offset_t where) static int -mem_seek (unix_stream * s, offset_t offset) +mem_seek (unix_stream * s, gfc_offset offset) { if (offset > s->file_length) @@ -1366,7 +1366,7 @@ inquire_readwrite (const char *string, int len) /* file_length()-- Return the file length in bytes, -1 if unknown */ -offset_t +gfc_offset file_length (stream * s) { @@ -1376,7 +1376,7 @@ file_length (stream * s) /* file_position()-- Return the current position of the file */ -offset_t +gfc_offset file_position (stream * s) { diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h index 112fd07..6234e25 100644 --- a/libgfortran/libgfortran.h +++ b/libgfortran/libgfortran.h @@ -50,7 +50,7 @@ Boston, MA 02111-1307, USA. */ #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif -typedef off_t offset_t; +typedef off_t gfc_offset; #ifndef NULL #define NULL (void *) 0 |