This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
patch, libfortran: Fix a few libgfortran warnings
- From: Thomas Koenig <tkoenig at netcologne dot de>
- To: fortran at gcc dot gnu dot org
- Cc: gcc-patches at gcc dot gnu dot org
- Date: Thu, 20 Dec 2007 21:09:14 +0100
- Subject: patch, libfortran: Fix a few libgfortran warnings
Hello world,
this fixes a few libgfortran warnings (mismatch of pointer types).
Regression-tested on i686-pc-linux-gnu.
OK for trunk?
Thomas
2007-12-20 Thomas Koenig <tkoenig@gcc.gnu.org>
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.
Index: intrinsics/pack_generic.c
===================================================================
--- intrinsics/pack_generic.c (revision 130993)
+++ intrinsics/pack_generic.c (working copy)
@@ -306,25 +306,25 @@ pack_internal (gfc_array_char *ret, cons
}
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)))
{
Index: intrinsics/unpack_generic.c
===================================================================
--- intrinsics/unpack_generic.c (revision 130993)
+++ intrinsics/unpack_generic.c (working copy)
@@ -189,12 +189,12 @@ unpack_internal (gfc_array_char *ret, co
}
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_
}
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_
}
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)))
{