aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@gnu.org>2006-12-29 09:46:35 +0000
committerMark Kettenis <kettenis@gnu.org>2006-12-29 09:46:35 +0000
commit0cb31fdf92f1ff6045ac28d1e50c87e5418e9859 (patch)
tree824584dcf0fa451172f53cc85cc872a57da8c3cd
parentcab737b91fedd56af3b24b5bdd3c3c2efb1426f2 (diff)
downloadgdb-0cb31fdf92f1ff6045ac28d1e50c87e5418e9859.zip
gdb-0cb31fdf92f1ff6045ac28d1e50c87e5418e9859.tar.gz
gdb-0cb31fdf92f1ff6045ac28d1e50c87e5418e9859.tar.bz2
* memory-map.c (memory_map_end_element): Move variable
declarations to the begining of the block.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/memory-map.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 04e96a6..ced7ede 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-29 Mark Kettenis <kettenis@gnu.org>
+
+ * memory-map.c (memory_map_end_element): Move variable
+ declarations to the begining of the block.
+
2006-12-28 Daniel Jacobowitz <dan@codesourcery.com>
* ia64-tdep.c (get_kernel_table): Correct signedness in check
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 991db1b..db4c22f 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -141,10 +141,11 @@ memory_map_end_element (void *data_, const XML_Char *name)
{
if (strcmp (data->property_name, "blocksize") == 0)
{
+ char *end = NULL;
+
if (!data->character_data)
throw_error (XML_PARSE_ERROR,
_("Empty content of 'property' element"));
- char *end = NULL;
data->currently_parsing->attrib.blocksize
= strtoul (data->character_data, &end, 0);
if (*end != '\0')