Commit e6082041 by Thomas Koenig

re PR libfortran/22423 (Warnings when building libgfortran)

2007-12-27  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.

From-SVN: r131204
parent 18bc9cca
2007-12-27 Thomas Koenig <tkoenig@gcc.gnu.org> 2007-12-27 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.
2007-12-27 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/34594 PR libfortran/34594
* runtime/error.c: If there was a previous error, don't * runtime/error.c: If there was a previous error, don't
mask it with another error mesage, EOF or EOR condition. mask it with another error mesage, EOF or EOR condition.
......
...@@ -306,25 +306,25 @@ pack_internal (gfc_array_char *ret, const gfc_array_char *array, ...@@ -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 *, 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); export_proto(pack);
void void
pack (gfc_array_char *ret, const gfc_array_char *array, 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)); pack_internal (ret, array, mask, vector, GFC_DESCRIPTOR_SIZE (array));
} }
extern void pack_char (gfc_array_char *, GFC_INTEGER_4, const gfc_array_char *, 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); GFC_INTEGER_4, GFC_INTEGER_4);
export_proto(pack_char); export_proto(pack_char);
void void
pack_char (gfc_array_char *ret, pack_char (gfc_array_char *ret,
GFC_INTEGER_4 ret_length __attribute__((unused)), 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, const gfc_array_char *vector, GFC_INTEGER_4 array_length,
GFC_INTEGER_4 vector_length __attribute__((unused))) GFC_INTEGER_4 vector_length __attribute__((unused)))
{ {
......
...@@ -189,12 +189,12 @@ unpack_internal (gfc_array_char *ret, const gfc_array_char *vector, ...@@ -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 *, 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); export_proto(unpack1);
void void
unpack1 (gfc_array_char *ret, const gfc_array_char *vector, 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, unpack_internal (ret, vector, mask, field,
GFC_DESCRIPTOR_SIZE (vector), GFC_DESCRIPTOR_SIZE (vector),
...@@ -202,7 +202,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *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, 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, const gfc_array_char *, GFC_INTEGER_4,
GFC_INTEGER_4); GFC_INTEGER_4);
export_proto(unpack1_char); export_proto(unpack1_char);
...@@ -210,7 +210,7 @@ export_proto(unpack1_char); ...@@ -210,7 +210,7 @@ export_proto(unpack1_char);
void void
unpack1_char (gfc_array_char *ret, unpack1_char (gfc_array_char *ret,
GFC_INTEGER_4 ret_length __attribute__((unused)), 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, const gfc_array_char *field, GFC_INTEGER_4 vector_length,
GFC_INTEGER_4 field_length) GFC_INTEGER_4 field_length)
{ {
...@@ -218,12 +218,12 @@ unpack1_char (gfc_array_char *ret, ...@@ -218,12 +218,12 @@ unpack1_char (gfc_array_char *ret,
} }
extern void unpack0 (gfc_array_char *, const gfc_array_char *, extern void unpack0 (gfc_array_char *, const gfc_array_char *,
const gfc_array_l4 *, char *); const gfc_array_l1 *, char *);
export_proto(unpack0); export_proto(unpack0);
void void
unpack0 (gfc_array_char *ret, const gfc_array_char *vector, 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; gfc_array_char tmp;
...@@ -234,14 +234,14 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector, ...@@ -234,14 +234,14 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
} }
extern void unpack0_char (gfc_array_char *, GFC_INTEGER_4, 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); char *, GFC_INTEGER_4, GFC_INTEGER_4);
export_proto(unpack0_char); export_proto(unpack0_char);
void void
unpack0_char (gfc_array_char *ret, unpack0_char (gfc_array_char *ret,
GFC_INTEGER_4 ret_length __attribute__((unused)), 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, char *field, GFC_INTEGER_4 vector_length,
GFC_INTEGER_4 field_length __attribute__((unused))) GFC_INTEGER_4 field_length __attribute__((unused)))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment