diff options
Diffstat (limited to 'libgfortran/io/transfer.c')
| -rw-r--r-- | libgfortran/io/transfer.c | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index c27f0f7..ec5240d 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -745,16 +745,14 @@ formatted_transfer (bt type, void *p, int len) return; -/* Come here when we need a data descriptor but don't have one. We - push the current format node back onto the input, then return and - let the user program call us back with the data. */ - -need_data: + /* Come here when we need a data descriptor but don't have one. We + push the current format node back onto the input, then return and + let the user program call us back with the data. */ + need_data: unget_format (f); } - /* Data transfer entry points. The type of the data entity is implicit in the subroutine call. This prevents us from having to share a common enum with the compiler. */ @@ -762,7 +760,6 @@ need_data: void transfer_integer (void *p, int kind) { - g.item_count++; if (ioparm.library_return != LIBRARY_OK) return; @@ -773,7 +770,6 @@ transfer_integer (void *p, int kind) void transfer_real (void *p, int kind) { - g.item_count++; if (ioparm.library_return != LIBRARY_OK) return; @@ -784,7 +780,6 @@ transfer_real (void *p, int kind) void transfer_logical (void *p, int kind) { - g.item_count++; if (ioparm.library_return != LIBRARY_OK) return; @@ -795,7 +790,6 @@ transfer_logical (void *p, int kind) void transfer_character (void *p, int len) { - g.item_count++; if (ioparm.library_return != LIBRARY_OK) return; @@ -806,7 +800,6 @@ transfer_character (void *p, int len) void transfer_complex (void *p, int kind) { - g.item_count++; if (ioparm.library_return != LIBRARY_OK) return; @@ -873,7 +866,6 @@ us_write (void) static void pre_position (void) { - if (current_unit->current_record) return; /* Already positioned. */ @@ -1140,9 +1132,7 @@ data_transfer_init (int read_flag) /* Start the data transfer if we are doing a formatted transfer. */ if (current_unit->flags.form == FORM_FORMATTED && !ioparm.list_format && ioparm.namelist_name == NULL && ionml == NULL) - - formatted_transfer (0, NULL, 0); - + formatted_transfer (0, NULL, 0); } @@ -1198,7 +1188,6 @@ next_record_r (int done) current_unit->bytes_left -= length; } } - break; case FORMATTED_SEQUENTIAL: @@ -1367,7 +1356,6 @@ next_record (int done) static void finalize_transfer (void) { - if ((ionml != NULL) && (ioparm.namelist_name != NULL)) { if (ioparm.namelist_read_mode) @@ -1429,7 +1417,6 @@ iolength_transfer (bt type, void *dest, int len) static void iolength_transfer_init (void) { - if (ioparm.iolength != NULL) *ioparm.iolength = 0; @@ -1438,7 +1425,6 @@ iolength_transfer_init (void) /* Set up the subroutine that will handle the transfers. */ transfer = iolength_transfer; - } @@ -1451,7 +1437,6 @@ void st_iolength (void) { library_start (); - iolength_transfer_init (); } @@ -1467,7 +1452,6 @@ st_iolength_done (void) void st_read (void) { - library_start (); data_transfer_init (1); @@ -1502,7 +1486,6 @@ void st_read_done (void) { finalize_transfer (); - library_end (); } @@ -1510,7 +1493,6 @@ st_read_done (void) void st_write (void) { - library_start (); data_transfer_init (0); } @@ -1519,7 +1501,6 @@ st_write (void) void st_write_done (void) { - finalize_transfer (); /* Deal with endfile conditions associated with sequential files. */ @@ -1590,7 +1571,6 @@ void st_set_nml_var_int (void * var_addr, char * var_name, int var_name_len, int kind) { - st_set_nml_var (var_addr, var_name, var_name_len, kind, BT_INTEGER, 0); } @@ -1598,7 +1578,6 @@ void st_set_nml_var_float (void * var_addr, char * var_name, int var_name_len, int kind) { - st_set_nml_var (var_addr, var_name, var_name_len, kind, BT_REAL, 0); } @@ -1606,7 +1585,6 @@ void st_set_nml_var_char (void * var_addr, char * var_name, int var_name_len, int kind, gfc_charlen_type string_length) { - st_set_nml_var (var_addr, var_name, var_name_len, kind, BT_CHARACTER, string_length); } @@ -1615,7 +1593,6 @@ void st_set_nml_var_complex (void * var_addr, char * var_name, int var_name_len, int kind) { - st_set_nml_var (var_addr, var_name, var_name_len, kind, BT_COMPLEX, 0); } @@ -1623,7 +1600,5 @@ void st_set_nml_var_log (void * var_addr, char * var_name, int var_name_len, int kind) { - st_set_nml_var (var_addr, var_name, var_name_len, kind, BT_LOGICAL, 0); } - |