From e623f035020ea7baa64933b4afaaa564b4c7e26d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 18 Dec 2019 13:27:18 -0500 Subject: [PATCH] Fix indentation (and clang warning) in c-lang.c I see this warning when building with clang: CXX c-lang.o /home/smarchi/src/binutils-gdb/gdb/c-lang.c:314:7: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] *length = i * width; ^ /home/smarchi/src/binutils-gdb/gdb/c-lang.c:308:4: note: previous statement is here if (extract_unsigned_integer (contents + i * width, ^ It took me a while to notice that some lines in that area have a spurious space before the tabs, at the beginning of the ling. I'm not sure how clang translates that to misleading indentation, but making the indentation correct gets rid of the error. There are many more instances of this in the code base (`grep -P '^ \t' *.c`), if others think it's a good idea, it would be pretty easy to fix them all up in one shot. gdb/ChangeLog: * c-lang.c (c_get_string, asm_language_defn): Remove space before tab. --- gdb/ChangeLog | 5 +++++ gdb/c-lang.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 26d152b817..53885e13fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-18 Simon Marchi + + * c-lang.c (c_get_string, asm_language_defn): Remove space + before tab. + 2019-12-18 Tom Tromey PR build/25250: diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 846970af7b..1f40e885d9 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -303,14 +303,14 @@ c_get_string (struct value *value, gdb::unique_xmalloc_ptr *buffer, if (*length >= 0) i = *length; else - /* Otherwise, look for a null character. */ - for (i = 0; i < fetchlimit; i++) + /* Otherwise, look for a null character. */ + for (i = 0; i < fetchlimit; i++) if (extract_unsigned_integer (contents + i * width, width, byte_order) == 0) - break; + break; /* I is now either a user-defined length, the number of non-null - characters, or FETCHLIMIT. */ + characters, or FETCHLIMIT. */ *length = i * width; buffer->reset ((gdb_byte *) xmalloc (*length)); memcpy (buffer->get (), contents, *length); @@ -1119,7 +1119,7 @@ extern const struct language_defn asm_language_defn = 0, /* String lower bound */ default_word_break_characters, default_collect_symbol_completion_matches, - c_language_arch_info, /* FIXME: la_language_arch_info. */ + c_language_arch_info, /* FIXME: la_language_arch_info. */ default_print_array_index, default_pass_by_reference, c_watch_location_expression, -- 2.34.1