diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2023-12-05 22:56:41 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2023-12-05 22:56:41 +0100 |
| commit | 9610ba7b6ff88c1c9b4fba232458e9397cc71a02 (patch) | |
| tree | 79f29c7202b08eca9e1f64a5b59bcbfa1225befb /libgfortran/io/transfer.c | |
| parent | 59be79fd596ec8f8fbdf1479bc99e6aba9c52778 (diff) | |
| download | gcc-9610ba7b6ff88c1c9b4fba232458e9397cc71a02.zip gcc-9610ba7b6ff88c1c9b4fba232458e9397cc71a02.tar.gz gcc-9610ba7b6ff88c1c9b4fba232458e9397cc71a02.tar.bz2 | |
libgfortran: Fix -Wincompatible-pointer-types errors
As reported, libgfortran fails to build on targets where int32_t and int
are different types, because it uses int vs. GFC_INTEGER_4 (under hood
int32_t) interchangeably.
The following patch fixes that.
2023-12-05 Florian Weimer <fweimer@redhat.com>
Jakub Jelinek <jakub@redhat.com>
* io/list_read.c (list_formatted_read_scalar) <case BT_CLASS>:
Change types of unit and noiostat to GFC_INTEGER_4 from int, change
type of child_iostat from to GFC_INTEGER_4 * from int *, formatting
fixes.
(nml_read_obj): Likewise.
* io/write.c (list_formatted_write_scalar) <case BT_CLASS>: Likewise.
(nml_write_obj): Likewise.
* io/transfer.c (unformatted_read, unformatted_write): Likewise.
Diffstat (limited to 'libgfortran/io/transfer.c')
| -rw-r--r-- | libgfortran/io/transfer.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 0104f6c..500db90 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -1092,17 +1092,17 @@ unformatted_read (st_parameter_dt *dtp, bt type, if (type == BT_CLASS) { - int unit = dtp->u.p.current_unit->unit_number; + GFC_INTEGER_4 unit = dtp->u.p.current_unit->unit_number; char tmp_iomsg[IOMSG_LEN] = ""; char *child_iomsg; gfc_charlen_type child_iomsg_len; - int noiostat; - int *child_iostat = NULL; + GFC_INTEGER_4 noiostat; + GFC_INTEGER_4 *child_iostat = NULL; /* Set iostat, intent(out). */ noiostat = 0; - child_iostat = (dtp->common.flags & IOPARM_HAS_IOSTAT) ? - dtp->common.iostat : &noiostat; + child_iostat = ((dtp->common.flags & IOPARM_HAS_IOSTAT) + ? dtp->common.iostat : &noiostat); /* Set iomsg, intent(inout). */ if (dtp->common.flags & IOPARM_HAS_IOMSG) @@ -1119,7 +1119,7 @@ unformatted_read (st_parameter_dt *dtp, bt type, /* Call the user defined unformatted READ procedure. */ dtp->u.p.current_unit->child_dtio++; dtp->u.p.ufdtio_ptr (dest, &unit, child_iostat, child_iomsg, - child_iomsg_len); + child_iomsg_len); dtp->u.p.current_unit->child_dtio--; return; } @@ -1222,17 +1222,17 @@ unformatted_write (st_parameter_dt *dtp, bt type, if (type == BT_CLASS) { - int unit = dtp->u.p.current_unit->unit_number; + GFC_INTEGER_4 unit = dtp->u.p.current_unit->unit_number; char tmp_iomsg[IOMSG_LEN] = ""; char *child_iomsg; gfc_charlen_type child_iomsg_len; - int noiostat; - int *child_iostat = NULL; + GFC_INTEGER_4 noiostat; + GFC_INTEGER_4 *child_iostat = NULL; /* Set iostat, intent(out). */ noiostat = 0; - child_iostat = (dtp->common.flags & IOPARM_HAS_IOSTAT) ? - dtp->common.iostat : &noiostat; + child_iostat = ((dtp->common.flags & IOPARM_HAS_IOSTAT) + ? dtp->common.iostat : &noiostat); /* Set iomsg, intent(inout). */ if (dtp->common.flags & IOPARM_HAS_IOMSG) @@ -1249,7 +1249,7 @@ unformatted_write (st_parameter_dt *dtp, bt type, /* Call the user defined unformatted WRITE procedure. */ dtp->u.p.current_unit->child_dtio++; dtp->u.p.ufdtio_ptr (source, &unit, child_iostat, child_iomsg, - child_iomsg_len); + child_iomsg_len); dtp->u.p.current_unit->child_dtio--; return; } @@ -1688,13 +1688,13 @@ formatted_transfer_scalar_read (st_parameter_dt *dtp, bt type, void *p, int kind return; if (require_type (dtp, BT_CLASS, type, f)) return; - int unit = dtp->u.p.current_unit->unit_number; + GFC_INTEGER_4 unit = dtp->u.p.current_unit->unit_number; char dt[] = "DT"; char tmp_iomsg[IOMSG_LEN] = ""; char *child_iomsg; gfc_charlen_type child_iomsg_len; - int noiostat; - int *child_iostat = NULL; + GFC_INTEGER_4 noiostat; + GFC_INTEGER_4 *child_iostat = NULL; char *iotype; gfc_charlen_type iotype_len = f->u.udf.string_len; @@ -1709,8 +1709,8 @@ formatted_transfer_scalar_read (st_parameter_dt *dtp, bt type, void *p, int kind /* Set iostat, intent(out). */ noiostat = 0; - child_iostat = (dtp->common.flags & IOPARM_HAS_IOSTAT) ? - dtp->common.iostat : &noiostat; + child_iostat = ((dtp->common.flags & IOPARM_HAS_IOSTAT) + ? dtp->common.iostat : &noiostat); /* Set iomsg, intent(inout). */ if (dtp->common.flags & IOPARM_HAS_IOMSG) @@ -2169,13 +2169,13 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin case FMT_DT: if (n == 0) goto need_data; - int unit = dtp->u.p.current_unit->unit_number; + GFC_INTEGER_4 unit = dtp->u.p.current_unit->unit_number; char dt[] = "DT"; char tmp_iomsg[IOMSG_LEN] = ""; char *child_iomsg; gfc_charlen_type child_iomsg_len; - int noiostat; - int *child_iostat = NULL; + GFC_INTEGER_4 noiostat; + GFC_INTEGER_4 *child_iostat = NULL; char *iotype; gfc_charlen_type iotype_len = f->u.udf.string_len; @@ -2190,8 +2190,8 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin /* Set iostat, intent(out). */ noiostat = 0; - child_iostat = (dtp->common.flags & IOPARM_HAS_IOSTAT) ? - dtp->common.iostat : &noiostat; + child_iostat = ((dtp->common.flags & IOPARM_HAS_IOSTAT) + ? dtp->common.iostat : &noiostat); /* Set iomsg, intent(inout). */ if (dtp->common.flags & IOPARM_HAS_IOMSG) |