summaryrefslogtreecommitdiff
path: root/gdb/d-valprint.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2012-03-01 19:26:12 +0000
committerTom Tromey <tromey@redhat.com>2012-03-01 19:26:12 +0000
commitad26b564b6127d039cb6dc50ddf6e00bb7a55bbb (patch)
treeedcdd265a8d641f86b21215f33528f85d745c068 /gdb/d-valprint.c
parent7a5bc8ff981bf778bb2ab405d61832c4994dcfd4 (diff)
downloadgdb-ad26b564b6127d039cb6dc50ddf6e00bb7a55bbb.tar.gz
* valprint.c (val_print): Update.
* p-valprint (pascal_val_print): Return void. * p-lang.h (pascal_val_print): Return void. * m2-valprint.c (m2_val_print): Return void. * m2-lang.h (m2_val_print): Return void. * language.h (struct language_defn) <la_val_print>: Return void. * language.c (unk_lang_val_print): Return void. * jv-valprint.c (java_val_print): Return void. * jv-lang.h (java_val_print): Return void. * f-valprint.c (f_val_print): Return void. * f-lang.h (f_val_print): Return void. * d-valprint.c (d_val_print): Return void. (dynamic_array_type): Update. * d-lang.h (d_val_print): Return void. * c-valprint.c (c_val_print): Return void. * c-lang.h (c_val_print): Return void. * ada-valprint.c (ada_vada_val_print, ada_val_print_1): Return void. * ada-lang.h (ada_val_print): Return void.
Diffstat (limited to 'gdb/d-valprint.c')
-rw-r--r--gdb/d-valprint.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
index 527c08784ed..3a8d11d5487 100644
--- a/gdb/d-valprint.c
+++ b/gdb/d-valprint.c
@@ -23,10 +23,10 @@
#include "d-lang.h"
#include "c-lang.h"
-/* Assuming that TYPE is a TYPE_CODE_STRUCT, verify that TYPE is
- a dynamic array, and then print its value to STREAM. Return
- the number of string characters printed, or -1 if TYPE is not
- a dynamic array. */
+/* Assuming that TYPE is a TYPE_CODE_STRUCT, verify that TYPE is a
+ dynamic array, and then print its value to STREAM. Return zero if
+ TYPE is a dynamic array, non-zero otherwise. */
+
static int
dynamic_array_type (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
@@ -60,16 +60,17 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr,
true_type = lookup_array_range_type (true_type, 0, length - 1);
ival = value_at (true_type, addr);
- return d_val_print (true_type,
- value_contents_for_printing (ival),
- value_embedded_offset (ival), addr,
- stream, recurse + 1, ival, options);
+ d_val_print (true_type,
+ value_contents_for_printing (ival),
+ value_embedded_offset (ival), addr,
+ stream, recurse + 1, ival, options);
+ return 0;
}
- return -1;
+ return 1;
}
/* Implements the la_val_print routine for language D. */
-int
+void
d_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
CORE_ADDR address, struct ui_file *stream, int recurse,
const struct value *val,
@@ -83,12 +84,10 @@ d_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
case TYPE_CODE_STRUCT:
ret = dynamic_array_type (type, valaddr, embedded_offset, address,
stream, recurse, val, options);
- if (ret != -1)
- break;
+ if (ret == 0)
+ break;
default:
- ret = c_val_print (type, valaddr, embedded_offset, address, stream,
- recurse, val, options);
+ c_val_print (type, valaddr, embedded_offset, address, stream,
+ recurse, val, options);
}
-
- return ret;
}