diff options
| author | Tom Tromey <tom@tromey.com> | 2016-06-25 08:41:45 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2016-06-25 08:41:45 -0600 |
| commit | 9e8a8ea8feadb0d3cd6443a1bc773b1dc835767e (patch) | |
| tree | 693ababf967cf65ecaabc1b797cde6a5ad8a52e6 | |
| parent | fccb08f8cd2035b50a2b0a5e09983180b7411685 (diff) | |
| download | gdb-9e8a8ea8feadb0d3cd6443a1bc773b1dc835767e.zip gdb-9e8a8ea8feadb0d3cd6443a1bc773b1dc835767e.tar.gz gdb-9e8a8ea8feadb0d3cd6443a1bc773b1dc835767e.tar.bz2 | |
Fix formatting in rust-lang.c
This fixes up a few formatting nits in rust-lang.c.
Built and regtested on x86-64 Fedora 23.
2016-06-25 Tom Tromey <tom@tromey.com>
* rust-lang.c (rust_get_disr_info, rust_print_type): Fix
formatting.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/rust-lang.c | 42 |
2 files changed, 25 insertions, 22 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba49b2b..e98a565 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-06-25 Tom Tromey <tom@tromey.com> + + * rust-lang.c (rust_get_disr_info, rust_print_type): Fix + formatting. + 2016-06-25 Manish Goregaokar <manish@mozilla.com> PR gdb/20239 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 0e9c62c..0c56a0f 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -147,15 +147,15 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr, field is zero. */ while ((token = strsep (&tail, "$")) != NULL) { - if (sscanf (token, "%lu", &fieldno) != 1) - { - /* We have reached the enum name, - which cannot start with a digit. */ - break; - } + if (sscanf (token, "%lu", &fieldno) != 1) + { + /* We have reached the enum name, which cannot start + with a digit. */ + break; + } if (fieldno >= TYPE_NFIELDS (member_type)) - error (_("%s refers to field after end of member type"), - RUST_ENUM_PREFIX); + error (_("%s refers to field after end of member type"), + RUST_ENUM_PREFIX); embedded_offset += TYPE_FIELD_BITPOS (member_type, fieldno) / 8; member_type = TYPE_FIELD_TYPE (member_type, fieldno); @@ -163,10 +163,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr, if (token >= name + strlen (TYPE_FIELD_NAME (type, 0))) error (_("Invalid form for %s"), RUST_ENUM_PREFIX); - value = unpack_long (member_type, - valaddr + embedded_offset); - - + value = unpack_long (member_type, valaddr + embedded_offset); if (value == 0) { @@ -879,16 +876,17 @@ rust_print_type (struct type *type, const char *varstring, } fputs_filtered ("{\n", stream); - if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX, - strlen (RUST_ENUM_PREFIX)) == 0) { - const char *zero_field = strrchr (TYPE_FIELD_NAME (type, 0), '$'); - if (zero_field != NULL && strlen (zero_field) > 1) - { - fprintfi_filtered (level + 2, stream, "%s,\n", zero_field+1); - /* There is no explicit discriminant field, skip nothing. */ - skip_to = 0; - } - } + if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX, + strlen (RUST_ENUM_PREFIX)) == 0) + { + const char *zero_field = strrchr (TYPE_FIELD_NAME (type, 0), '$'); + if (zero_field != NULL && strlen (zero_field) > 1) + { + fprintfi_filtered (level + 2, stream, "%s,\n", zero_field + 1); + /* There is no explicit discriminant field, skip nothing. */ + skip_to = 0; + } + } for (i = 0; i < TYPE_NFIELDS (type); ++i) { |