aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@adacore.com>2013-12-19 20:19:45 +0400
committerJoel Brobecker <brobecker@adacore.com>2014-01-07 08:17:40 +0400
commit4fbf5aa5f4c44b9bb56faee74c91bbb69829264f (patch)
tree9b09c8eddb9035307e008b0fb59b63f138c20569 /gdb
parent71855601a553755743aff19a36c53c62f3d63270 (diff)
downloadgdb-4fbf5aa5f4c44b9bb56faee74c91bbb69829264f.zip
gdb-4fbf5aa5f4c44b9bb56faee74c91bbb69829264f.tar.gz
gdb-4fbf5aa5f4c44b9bb56faee74c91bbb69829264f.tar.bz2
ada_print_floating: Remove use of statically sized buffer.
ada_print_floating declares a char buffer with a size that we're hoping to always be large enough to hold any string representation of a float value. But that's not really necessary, and also forces us to create a small wrapper (ui_memcpy) to perform the extraction from a temporary stream into this buffer. This patches fixes both issues by relying on ui_file_xstrdup. This forces us to make a few adjustments that are minor in nature, as we now need to defer the cleanup to the end of the function. gdb/ChangeLog: * ada-valprint.c (ui_memcpy): Delete. (ada_print_floating): Update documentation. Add empty line between between function documentation and implementation. Delete variable "buffer". Use ui_file_xstrdup in place of ui_file_put. Minor adjustments following this change.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/ada-valprint.c24
2 files changed, 16 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e668617..9fc947b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2014-01-07 Joel Brobecker <brobecker@adacore.com>
+ * ada-valprint.c (ui_memcpy): Delete.
+ (ada_print_floating): Update documentation. Add empty line
+ between between function documentation and implementation.
+ Delete variable "buffer". Use ui_file_xstrdup in place of
+ ui_file_put. Minor adjustments following this change.
+
+2014-01-07 Joel Brobecker <brobecker@adacore.com>
+
* ada-valprint.c (ada_val_print_string): New function,
extracted from ada_val_print_array.
(ada_val_print_array): Replace extracted code by call
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index d1c8553..1ae2089 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -289,32 +289,22 @@ char_at (const gdb_byte *string, int i, int type_len,
type_len, byte_order);
}
-/* Wrapper around memcpy to make it legal argument to ui_file_put. */
-static void
-ui_memcpy (void *dest, const char *buffer, long len)
-{
- memcpy (dest, buffer, (size_t) len);
- ((char *) dest)[len] = '\0';
-}
-
/* Print a floating-point value of type TYPE, pointed to in GDB by
VALADDR, on STREAM. Use Ada formatting conventions: there must be
a decimal point, and at least one digit before and after the
- point. We use GNAT format for NaNs and infinities. */
+ point. We use the GNAT format for NaNs and infinities. */
+
static void
ada_print_floating (const gdb_byte *valaddr, struct type *type,
struct ui_file *stream)
{
- char buffer[64];
char *s, *result;
struct ui_file *tmp_stream = mem_fileopen ();
struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_stream);
print_floating (valaddr, type, tmp_stream);
- ui_file_put (tmp_stream, ui_memcpy, buffer);
- do_cleanups (cleanups);
-
- result = buffer;
+ result = ui_file_xstrdup (tmp_stream, NULL);
+ make_cleanup (xfree, result);
/* Modify for Ada rules. */
@@ -348,9 +338,11 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type,
fprintf_filtered (stream, "%s.0", result);
else
fprintf_filtered (stream, "%.*s.0%s", (int) (s-result), result, s);
- return;
}
- fprintf_filtered (stream, "%s", result);
+ else
+ fprintf_filtered (stream, "%s", result);
+
+ do_cleanups (cleanups);
}
void