summaryrefslogtreecommitdiff
path: root/gdb/f-valprint.c
diff options
context:
space:
mode:
authorDavid Lecomber <david@lecomber.net>2003-09-09 23:09:37 +0000
committerDavid Lecomber <david@lecomber.net>2003-09-09 23:09:37 +0000
commit56334e39b5076a0e4b5e56d7b31971a705a8e883 (patch)
tree6352539781b600639bd412ae85369003f1665539 /gdb/f-valprint.c
parentb15fd934b773e3b77c36f7c114b8d8860619e1ab (diff)
downloadgdb-56334e39b5076a0e4b5e56d7b31971a705a8e883.tar.gz
Reverting until I learn how to conform..
Diffstat (limited to 'gdb/f-valprint.c')
-rw-r--r--gdb/f-valprint.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 9d89da47b2b..f67a260d24c 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -47,8 +47,7 @@ static void f77_print_array (struct type *, char *, CORE_ADDR,
enum val_prettyprint);
static void f77_print_array_1 (int, int, struct type *, char *,
CORE_ADDR, struct ui_file *, int, int, int,
- enum val_prettyprint,
- int *elts);
+ enum val_prettyprint);
static void f77_create_arrayprint_offset_tbl (struct type *,
struct ui_file *);
static void f77_get_dynamic_length_of_aggregate (struct type *);
@@ -272,36 +271,31 @@ f77_create_arrayprint_offset_tbl (struct type *type, struct ui_file *stream)
}
}
-
-
/* Actual function which prints out F77 arrays, Valaddr == address in
the superior. Address == the address in the inferior. */
+
static void
f77_print_array_1 (int nss, int ndimensions, struct type *type, char *valaddr,
CORE_ADDR address, struct ui_file *stream, int format,
- int deref_ref, int recurse, enum val_prettyprint pretty,
- int *elts)
+ int deref_ref, int recurse, enum val_prettyprint pretty)
{
int i;
if (nss != ndimensions)
{
- for (i = 0; i < F77_DIM_SIZE (nss) && *elts < print_max; i++)
+ for (i = 0; i < F77_DIM_SIZE (nss); i++)
{
fprintf_filtered (stream, "( ");
f77_print_array_1 (nss + 1, ndimensions, TYPE_TARGET_TYPE (type),
valaddr + i * F77_DIM_OFFSET (nss),
address + i * F77_DIM_OFFSET (nss),
- stream, format, deref_ref, recurse, pretty, elts);
+ stream, format, deref_ref, recurse, pretty);
fprintf_filtered (stream, ") ");
}
- if (*elts >= print_max && i < F77_DIM_SIZE (nss)) {
- fprintf_filtered (stream, "...");
- }
}
else
{
- for (i = 0; (i < F77_DIM_SIZE (nss) && (*elts) < print_max); i++ , (*elts)++)
+ for (i = 0; (i < F77_DIM_SIZE (nss) && i < print_max); i++)
{
val_print (TYPE_TARGET_TYPE (type),
valaddr + i * F77_DIM_OFFSET (ndimensions),
@@ -312,7 +306,7 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type, char *valaddr,
if (i != (F77_DIM_SIZE (nss) - 1))
fprintf_filtered (stream, ", ");
- if ((( *elts) == print_max - 1) &&(i != (F77_DIM_SIZE (nss) - 1)))
+ if (i == print_max - 1)
fprintf_filtered (stream, "...");
}
}
@@ -327,7 +321,6 @@ f77_print_array (struct type *type, char *valaddr, CORE_ADDR address,
enum val_prettyprint pretty)
{
int ndimensions;
- int elts = 0;
ndimensions = calc_f77_array_dims (type);
@@ -342,7 +335,7 @@ f77_print_array (struct type *type, char *valaddr, CORE_ADDR address,
f77_create_arrayprint_offset_tbl (type, stream);
f77_print_array_1 (1, ndimensions, type, valaddr, address, stream, format,
- deref_ref, recurse, pretty, &elts);
+ deref_ref, recurse, pretty);
}