From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 4040F3857815; Mon, 31 Jan 2022 17:23:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4040F3857815 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: fix some clang-tidy readability-misleading-indentation warnings X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 8d2ef06e1c220bcfb133a47b98b6287ccabdb587 X-Git-Newrev: 492325c4b78933e41608c53963d29b1f16affd47 Message-Id: <20220131172303.4040F3857815@sourceware.org> Date: Mon, 31 Jan 2022 17:23:03 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jan 2022 17:23:03 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D492325c4b789= 33e41608c53963d29b1f16affd47 commit 492325c4b78933e41608c53963d29b1f16affd47 Author: Simon Marchi Date: Mon Jan 31 09:44:46 2022 -0500 gdb: fix some clang-tidy readability-misleading-indentation warnings =20 I have warnings like these showing in my editor all the time, so I thought I'd run clang-tidy with this diagnostic on all the files (that I can compile) and fix them. =20 There is still one warning, in utils.c, but that's because some code is mixed up with preprocessor macros (#ifdef TUI), so I think there no good solution there. =20 Change-Id: I345175fc7dd865318f0fbe61ac026c88c3b6a96b Diff: --- gdb/disasm.c | 2 +- gdb/dtrace-probe.c | 2 +- gdb/hppa-tdep.c | 2 +- gdb/mips-tdep.c | 2 +- gdb/p-valprint.c | 2 +- gdb/sparc64-tdep.c | 4 ++-- gdb/tracepoint.c | 16 ++++++++-------- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gdb/disasm.c b/gdb/disasm.c index 3000e5dddad..5cd1f5adbd2 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -189,7 +189,7 @@ line_is_less_than (const deprecated_dis_line_entry &mle= 1, { if (mle1.start_pc !=3D mle2.start_pc) val =3D mle1.start_pc < mle2.start_pc; - else + else val =3D mle1.line < mle2.line; } else diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c index 9aeefb6060c..6f01edf3924 100644 --- a/gdb/dtrace-probe.c +++ b/gdb/dtrace-probe.c @@ -851,7 +851,7 @@ dtrace_static_probe_ops::get_probes if (bfd_malloc_and_get_section (abfd, sect, &dof) && dof !=3D NULL) dtrace_process_dof (sect, objfile, probesp, (struct dtrace_dof_hdr *) dof); - else + else complaint (_("could not obtain the contents of" "section '%s' in objfile `%s'."), bfd_section_name (sect), bfd_get_filename (abfd)); diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 32c54357045..7734115b744 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -2171,7 +2171,7 @@ hppa_frame_cache (struct frame_info *this_frame, void= **this_cache) fprintf_unfiltered (gdb_stdlog, " (base=3D%s) [saved]", paddress (gdbarch, cache->base)); } - else + else { /* The prologue has been slowly allocating stack space. Adjust the SP back. */ diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index e5f8c6b2053..1c080bbe50f 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -2063,7 +2063,7 @@ micromips_next_pc (struct regcache *regcache, CORE_AD= DR pc) if (regcache_raw_get_signed (regcache, b0s5_reg (insn >> 16)) !=3D regcache_raw_get_signed (regcache, b5s5_reg (insn >> 16))) pc +=3D micromips_relative_offset16 (insn); - else + else pc +=3D micromips_pc_insn_size (gdbarch, pc); break; =20 diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index 635d7ed5e4d..a88d6b9a82c 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -313,7 +313,7 @@ pascal_language::value_print_inner (struct value *val, } else { - if (pascal_is_string_type (type, &length_pos, &length_size, + if (pascal_is_string_type (type, &length_pos, &length_size, &string_pos, &char_type, NULL) > 0) { len =3D extract_unsigned_integer (valaddr + length_pos, diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c index 95d46c83253..7d9b313783a 100644 --- a/gdb/sparc64-tdep.c +++ b/gdb/sparc64-tdep.c @@ -327,8 +327,8 @@ adi_is_addr_mapped (CORE_ADDR vaddr, size_t cnt) } } } - else - warning (_("unable to open /proc file '%s'"), filename); + else + warning (_("unable to open /proc file '%s'"), filename); =20 return false; } diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 95fc58fb8f0..506af3c527e 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2410,14 +2410,14 @@ tfind_line_command (const char *args, int from_tty) error (_("Cannot find a good line.")); } } - else - { - /* Is there any case in which we get here, and have an address - which the user would want to see? If we have debugging - symbols and no line numbers? */ - error (_("Line number %d is out of range for \"%s\"."), - sal.line, symtab_to_filename_for_display (sal.symtab)); - } + else + { + /* Is there any case in which we get here, and have an address + which the user would want to see? If we have debugging + symbols and no line numbers? */ + error (_("Line number %d is out of range for \"%s\"."), + sal.line, symtab_to_filename_for_display (sal.symtab)); + } =20 /* Find within range of stated line. */ if (args && *args)