From e608204146cd98bd8b8dcd0be1f6ae64f0fdabbd Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Thu, 27 Dec 2007 15:00:10 +0000 Subject: [PATCH] re PR libfortran/22423 (Warnings when building libgfortran) 2007-12-27 Thomas Koenig PR libfortran/22423 * intrinsics/pack_generic.c (pack): Change type of mask argument to gfc_array_l1 * in prototype and function. (pack_char): Likewise. * intrinsics/unpack_generic.c (unpack1): Likewise. (unpack1_char): Likewise. (unpack0): Likewise. (unpack0_char): Likewise. From-SVN: r131204 --- libgfortran/ChangeLog | 11 +++++++++++ libgfortran/intrinsics/pack_generic.c | 8 ++++---- libgfortran/intrinsics/unpack_generic.c | 16 ++++++++-------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index f7d260dd7c6..2b8611018cc 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,14 @@ +2007-12-27 Thomas Koenig + + PR libfortran/22423 + * intrinsics/pack_generic.c (pack): Change type of mask argument + to gfc_array_l1 * in prototype and function. + (pack_char): Likewise. + * intrinsics/unpack_generic.c (unpack1): Likewise. + (unpack1_char): Likewise. + (unpack0): Likewise. + (unpack0_char): Likewise. + 2007-12-27 Thomas Koenig PR libfortran/34594 diff --git a/libgfortran/intrinsics/pack_generic.c b/libgfortran/intrinsics/pack_generic.c index 8fd52319643..61b41e53e65 100644 --- a/libgfortran/intrinsics/pack_generic.c +++ b/libgfortran/intrinsics/pack_generic.c @@ -306,25 +306,25 @@ pack_internal (gfc_array_char *ret, const gfc_array_char *array, } extern void pack (gfc_array_char *, const gfc_array_char *, - const gfc_array_l4 *, const gfc_array_char *); + const gfc_array_l1 *, const gfc_array_char *); export_proto(pack); void pack (gfc_array_char *ret, const gfc_array_char *array, - const gfc_array_l4 *mask, const gfc_array_char *vector) + const gfc_array_l1 *mask, const gfc_array_char *vector) { pack_internal (ret, array, mask, vector, GFC_DESCRIPTOR_SIZE (array)); } extern void pack_char (gfc_array_char *, GFC_INTEGER_4, const gfc_array_char *, - const gfc_array_l4 *, const gfc_array_char *, + const gfc_array_l1 *, const gfc_array_char *, GFC_INTEGER_4, GFC_INTEGER_4); export_proto(pack_char); void pack_char (gfc_array_char *ret, GFC_INTEGER_4 ret_length __attribute__((unused)), - const gfc_array_char *array, const gfc_array_l4 *mask, + const gfc_array_char *array, const gfc_array_l1 *mask, const gfc_array_char *vector, GFC_INTEGER_4 array_length, GFC_INTEGER_4 vector_length __attribute__((unused))) { diff --git a/libgfortran/intrinsics/unpack_generic.c b/libgfortran/intrinsics/unpack_generic.c index fcf464b09ea..05141edd959 100644 --- a/libgfortran/intrinsics/unpack_generic.c +++ b/libgfortran/intrinsics/unpack_generic.c @@ -189,12 +189,12 @@ unpack_internal (gfc_array_char *ret, const gfc_array_char *vector, } extern void unpack1 (gfc_array_char *, const gfc_array_char *, - const gfc_array_l4 *, const gfc_array_char *); + const gfc_array_l1 *, const gfc_array_char *); export_proto(unpack1); void unpack1 (gfc_array_char *ret, const gfc_array_char *vector, - const gfc_array_l4 *mask, const gfc_array_char *field) + const gfc_array_l1 *mask, const gfc_array_char *field) { unpack_internal (ret, vector, mask, field, GFC_DESCRIPTOR_SIZE (vector), @@ -202,7 +202,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector, } extern void unpack1_char (gfc_array_char *, GFC_INTEGER_4, - const gfc_array_char *, const gfc_array_l4 *, + const gfc_array_char *, const gfc_array_l1 *, const gfc_array_char *, GFC_INTEGER_4, GFC_INTEGER_4); export_proto(unpack1_char); @@ -210,7 +210,7 @@ export_proto(unpack1_char); void unpack1_char (gfc_array_char *ret, GFC_INTEGER_4 ret_length __attribute__((unused)), - const gfc_array_char *vector, const gfc_array_l4 *mask, + const gfc_array_char *vector, const gfc_array_l1 *mask, const gfc_array_char *field, GFC_INTEGER_4 vector_length, GFC_INTEGER_4 field_length) { @@ -218,12 +218,12 @@ unpack1_char (gfc_array_char *ret, } extern void unpack0 (gfc_array_char *, const gfc_array_char *, - const gfc_array_l4 *, char *); + const gfc_array_l1 *, char *); export_proto(unpack0); void unpack0 (gfc_array_char *ret, const gfc_array_char *vector, - const gfc_array_l4 *mask, char *field) + const gfc_array_l1 *mask, char *field) { gfc_array_char tmp; @@ -234,14 +234,14 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector, } extern void unpack0_char (gfc_array_char *, GFC_INTEGER_4, - const gfc_array_char *, const gfc_array_l4 *, + const gfc_array_char *, const gfc_array_l1 *, char *, GFC_INTEGER_4, GFC_INTEGER_4); export_proto(unpack0_char); void unpack0_char (gfc_array_char *ret, GFC_INTEGER_4 ret_length __attribute__((unused)), - const gfc_array_char *vector, const gfc_array_l4 *mask, + const gfc_array_char *vector, const gfc_array_l1 *mask, char *field, GFC_INTEGER_4 vector_length, GFC_INTEGER_4 field_length __attribute__((unused))) {