diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2011-04-12 22:27:49 +0300 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2011-04-12 22:27:49 +0300 |
| commit | 44720bef9d5a11cf39c1eabbeb2c0739d0504ef8 (patch) | |
| tree | 17933ebe7d8de121ec47c896cf51dd424e7498fd /libgfortran/io | |
| parent | 99ee02511431124acbfded6350ce5f857664560d (diff) | |
| download | gcc-44720bef9d5a11cf39c1eabbeb2c0739d0504ef8.zip gcc-44720bef9d5a11cf39c1eabbeb2c0739d0504ef8.tar.gz gcc-44720bef9d5a11cf39c1eabbeb2c0739d0504ef8.tar.bz2 | |
Cleanup memsize types
From-SVN: r172340
Diffstat (limited to 'libgfortran/io')
| -rw-r--r-- | libgfortran/io/io.h | 11 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 18 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 2 |
3 files changed, 15 insertions, 16 deletions
diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index b48582d..37353d7 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -53,22 +53,21 @@ struct gfc_unit; #define is_char4_unit(dtp) ((dtp)->u.p.unit_is_internal && (dtp)->common.unit) /* The array_loop_spec contains the variables for the loops over index ranges - that are encountered. Since the variables can be negative, ssize_t - is used. */ + that are encountered. */ typedef struct array_loop_spec { /* Index counter for this dimension. */ - ssize_t idx; + index_type idx; /* Start for the index counter. */ - ssize_t start; + index_type start; /* End for the index counter. */ - ssize_t end; + index_type end; /* Step for the index counter. */ - ssize_t step; + index_type step; } array_loop_spec; diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 6e1cb69..39783bf 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -2172,7 +2172,7 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad, } /* Now read the index. */ - if (convert_integer (dtp, sizeof(ssize_t), neg)) + if (convert_integer (dtp, sizeof(index_type), neg)) { if (is_char) sprintf (parse_err_msg, "Bad integer substring qualifier"); @@ -2187,11 +2187,11 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad, if (!null_flag) { if (indx == 0) - memcpy (&ls[dim].start, dtp->u.p.value, sizeof(ssize_t)); + memcpy (&ls[dim].start, dtp->u.p.value, sizeof(index_type)); if (indx == 1) - memcpy (&ls[dim].end, dtp->u.p.value, sizeof(ssize_t)); + memcpy (&ls[dim].end, dtp->u.p.value, sizeof(index_type)); if (indx == 2) - memcpy (&ls[dim].step, dtp->u.p.value, sizeof(ssize_t)); + memcpy (&ls[dim].step, dtp->u.p.value, sizeof(index_type)); } /* Singlet or doublet indices. */ @@ -2199,7 +2199,7 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad, { if (indx == 0) { - memcpy (&ls[dim].start, dtp->u.p.value, sizeof(ssize_t)); + memcpy (&ls[dim].start, dtp->u.p.value, sizeof(index_type)); /* If -std=f95/2003 or an array section is specified, do not allow excess data to be processed. */ @@ -2229,10 +2229,10 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad, } /* Check the values of the triplet indices. */ - if ((ls[dim].start > (ssize_t) GFC_DIMENSION_UBOUND(ad[dim])) - || (ls[dim].start < (ssize_t) GFC_DIMENSION_LBOUND(ad[dim])) - || (ls[dim].end > (ssize_t) GFC_DIMENSION_UBOUND(ad[dim])) - || (ls[dim].end < (ssize_t) GFC_DIMENSION_LBOUND(ad[dim]))) + if ((ls[dim].start > GFC_DIMENSION_UBOUND(ad[dim])) + || (ls[dim].start < GFC_DIMENSION_LBOUND(ad[dim])) + || (ls[dim].end > GFC_DIMENSION_UBOUND(ad[dim])) + || (ls[dim].end < GFC_DIMENSION_LBOUND(ad[dim]))) { if (is_char) sprintf (parse_err_msg, "Substring out of range"); diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 987c3cd..4733d51 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1932,7 +1932,7 @@ obj_loop: { obj->ls[dim_i].idx += nml_carry ; nml_carry = 0; - if (obj->ls[dim_i].idx > (ssize_t) GFC_DESCRIPTOR_UBOUND(obj,dim_i)) + if (obj->ls[dim_i].idx > GFC_DESCRIPTOR_UBOUND(obj,dim_i)) { obj->ls[dim_i].idx = GFC_DESCRIPTOR_LBOUND(obj,dim_i); nml_carry = 1; |