From 24b21115f522cd0fbe55986cd914a593576294ef Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 27 May 2021 15:18:49 -0400 Subject: [PATCH] gdb: fix tab after space indentation issues I spotted some indentation issues where we had some spaces followed by tabs at beginning of line, that I wanted to fix. So while at it, I did a quick grep to find and fix all I could find. gdb/ChangeLog: * Fix tab after space indentation issues throughout. Change-Id: I1acb414dd9c593b474ae2b8667496584df4316fd --- gdb/ChangeLog | 4 ++++ gdb/ada-lang.c | 6 +++--- gdb/aix-thread.c | 4 ++-- gdb/amd64-tdep.c | 16 ++++++++-------- gdb/amd64-windows-tdep.c | 18 +++++++++--------- gdb/arm-tdep.c | 6 +++--- gdb/breakpoint.c | 4 ++-- gdb/coffread.c | 26 +++++++++++++------------- gdb/dbxread.c | 22 +++++++++++----------- gdb/dwarf2/index-write.c | 2 +- gdb/frv-linux-tdep.c | 14 +++++++------- gdb/gnu-nat.h | 4 ++-- gdb/hppa-tdep.c | 6 +++--- gdb/i386-fbsd-nat.c | 16 ++++++++-------- gdb/i386-linux-tdep.h | 2 +- gdb/i386-tdep.c | 22 +++++++++++----------- gdb/infcmd.c | 2 +- gdb/infrun.c | 2 +- gdb/macroscope.c | 4 ++-- gdb/mi/mi-cmd-disas.c | 2 +- gdb/mi/mi-cmd-var.c | 2 +- gdb/mips-netbsd-tdep.c | 2 +- gdb/mips-tdep.c | 2 +- gdb/nat/linux-namespaces.c | 6 +++--- gdb/nat/x86-dregs.c | 2 +- gdb/nios2-tdep.c | 2 +- gdb/nto-procfs.c | 2 +- gdb/p-lang.c | 4 ++-- gdb/ppc-sysv-tdep.c | 2 +- gdb/printcmd.c | 2 +- gdb/record-full.c | 4 ++-- gdb/regcache.c | 6 +++--- gdb/remote.c | 2 +- gdb/rs6000-tdep.c | 16 ++++++++-------- gdb/serial.c | 2 +- gdb/sh-tdep.c | 4 ++-- gdb/source.c | 4 ++-- gdb/stabsread.c | 2 +- gdb/stack.c | 2 +- gdb/stubs/sh-stub.c | 10 +++++----- gdb/stubs/sparc-stub.c | 2 +- gdb/symfile.c | 2 +- gdb/symtab.c | 2 +- gdb/tracepoint.c | 6 +++--- gdb/windows-nat.c | 2 +- gdb/xtensa-tdep.c | 6 +++--- 46 files changed, 142 insertions(+), 138 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fa3940c2c0d..03910c0634c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2021-05-27 Simon Marchi + + * Fix tab after space indentation issues throughout. + 2021-05-27 Simon Marchi * Fix some indentation mistakes throughout. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index f0c1aa2c8a6..6ed6b65e705 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2169,9 +2169,9 @@ decode_constrained_packed_array (struct value *arr) && ada_is_modular_type (value_type (arr))) { /* This is a (right-justified) modular type representing a packed - array with no wrapper. In order to interpret the value through - the (left-justified) packed array type we just built, we must - first left-justify it. */ + array with no wrapper. In order to interpret the value through + the (left-justified) packed array type we just built, we must + first left-justify it. */ int bit_size, bit_pos; ULONGEST mod; diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index d4147466c00..0ab4d7ba9b5 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -433,13 +433,13 @@ pdc_read_regs (pthdb_user_t user, if (!ptrace64aix (PTT_READ_SPRS, tid, (unsigned long) &sprs64, 0, NULL)) memset (&sprs64, 0, sizeof (sprs64)); - memcpy (&context->msr, &sprs64, sizeof(sprs64)); + memcpy (&context->msr, &sprs64, sizeof(sprs64)); } else { if (!ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL)) memset (&sprs32, 0, sizeof (sprs32)); - memcpy (&context->msr, &sprs32, sizeof(sprs32)); + memcpy (&context->msr, &sprs32, sizeof(sprs32)); } } return 0; diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 66a7c02f534..91305ddeb44 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -2018,8 +2018,8 @@ amd64_analyze_stack_align (CORE_ADDR pc, CORE_ADDR current_pc, "andq $-XXX, %rsp" can be either 4 bytes or 7 bytes: - 0x48 0x83 0xe4 0xf0 andq $-16, %rsp - 0x48 0x81 0xe4 0x00 0xff 0xff 0xff andq $-256, %rsp + 0x48 0x83 0xe4 0xf0 andq $-16, %rsp + 0x48 0x81 0xe4 0x00 0xff 0xff 0xff andq $-256, %rsp */ gdb_byte buf[18]; @@ -2182,13 +2182,13 @@ amd64_x32_analyze_stack_align (CORE_ADDR pc, CORE_ADDR current_pc, "andq $-XXX, %rsp" can be either 4 bytes or 7 bytes: - 0x48 0x83 0xe4 0xf0 andq $-16, %rsp - 0x48 0x81 0xe4 0x00 0xff 0xff 0xff andq $-256, %rsp + 0x48 0x83 0xe4 0xf0 andq $-16, %rsp + 0x48 0x81 0xe4 0x00 0xff 0xff 0xff andq $-256, %rsp "andl $-XXX, %esp" can be either 3 bytes or 6 bytes: - 0x83 0xe4 0xf0 andl $-16, %esp - 0x81 0xe4 0x00 0xff 0xff 0xff andl $-256, %esp + 0x83 0xe4 0xf0 andl $-16, %esp + 0x81 0xe4 0x00 0xff 0xff 0xff andl $-256, %esp */ gdb_byte buf[19]; @@ -3342,9 +3342,9 @@ void _initialize_amd64_tdep () { gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, GDB_OSABI_NONE, - amd64_none_init_abi); + amd64_none_init_abi); gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32, GDB_OSABI_NONE, - amd64_x32_none_init_abi); + amd64_x32_none_init_abi); } diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index 4d719d259a1..e95b8330fd6 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -429,17 +429,17 @@ amd64_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) gdb_byte buf[4]; if (target_read_memory (pc + 1, buf, sizeof buf) == 0) - { - struct bound_minimal_symbol s; - CORE_ADDR call_dest; + { + struct bound_minimal_symbol s; + CORE_ADDR call_dest; call_dest = pc + 5 + extract_signed_integer (buf, 4, byte_order); - s = lookup_minimal_symbol_by_pc (call_dest); - if (s.minsym != NULL - && s.minsym->linkage_name () != NULL - && strcmp (s.minsym->linkage_name (), "__main") == 0) - pc += 5; - } + s = lookup_minimal_symbol_by_pc (call_dest); + if (s.minsym != NULL + && s.minsym->linkage_name () != NULL + && strcmp (s.minsym->linkage_name (), "__main") == 0) + pc += 5; + } } return pc; diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index f8da6388047..857a52a9a51 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -4614,15 +4614,15 @@ displaced_write_reg (regcache *regs, arm_displaced_step_copy_insn_closure *dsc, case BX_WRITE_PC: bx_write_pc (regs, val); - break; + break; case LOAD_WRITE_PC: load_write_pc (regs, dsc, val); - break; + break; case ALU_WRITE_PC: alu_write_pc (regs, dsc, val); - break; + break; case CANNOT_WRITE_PC: warning (_("Instruction wrote to PC in an unexpected way when " diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fd98ded8e75..aa6b348dffd 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -785,7 +785,7 @@ set_condition_evaluation_mode (const char *args, int from_tty, target. */ for (bp_location *loc : all_bp_locations ()) mark_breakpoint_location_modified (loc); - } + } else { /* Manually mark non-duplicate locations to synch conditions @@ -10712,7 +10712,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty, gdbarch *caller_arch = frame_unwind_caller_arch (wp_frame); CORE_ADDR caller_pc = frame_unwind_caller_pc (wp_frame); - scope_breakpoint + scope_breakpoint = create_internal_breakpoint (caller_arch, caller_pc, bp_watchpoint_scope, &momentary_breakpoint_ops); diff --git a/gdb/coffread.c b/gdb/coffread.c index b527f934c95..0135363bc5a 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -968,25 +968,25 @@ coff_symtab_read (minimal_symbol_reader &reader, symbol lookup which returned no match. */ break; } - else if (cs->c_secnum == N_ABS) - { - /* Use the correct minimal symbol type (and don't - relocate) for absolute values. */ - ms_type = mst_abs; - sec = cs_to_section (cs, objfile); - tmpaddr = cs->c_value; - } + else if (cs->c_secnum == N_ABS) + { + /* Use the correct minimal symbol type (and don't + relocate) for absolute values. */ + ms_type = mst_abs; + sec = cs_to_section (cs, objfile); + tmpaddr = cs->c_value; + } else { asection *bfd_section = cs_to_bfd_section (cs, objfile); sec = cs_to_section (cs, objfile); tmpaddr = cs->c_value; - /* Statics in a PE file also get relocated. */ - if (cs->c_sclass == C_EXT - || cs->c_sclass == C_THUMBEXTFUNC - || cs->c_sclass == C_THUMBEXT - || (pe_file && (cs->c_sclass == C_STAT))) + /* Statics in a PE file also get relocated. */ + if (cs->c_sclass == C_EXT + || cs->c_sclass == C_THUMBEXTFUNC + || cs->c_sclass == C_THUMBEXT + || (pe_file && (cs->c_sclass == C_STAT))) offset = objfile->section_offsets[sec]; if (bfd_section->flags & SEC_CODE) diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 5cf77e9c08a..cf35880b509 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -1434,10 +1434,10 @@ read_dbx_symtab (minimal_symbol_reader &reader, if (!p) continue; /* Not a debugging symbol. */ - sym_len = 0; + sym_len = 0; sym_name = NULL; /* pacify "gcc -Werror" */ - if (psymtab_language == language_cplus) - { + if (psymtab_language == language_cplus) + { std::string name (namestring, p - namestring); gdb::unique_xmalloc_ptr new_name = cp_canonicalize_string (name.c_str ()); @@ -1449,11 +1449,11 @@ read_dbx_symtab (minimal_symbol_reader &reader, } } - if (sym_len == 0) - { - sym_name = namestring; - sym_len = p - namestring; - } + if (sym_len == 0) + { + sym_name = namestring; + sym_len = p - namestring; + } /* Main processing section for debugging symbols which the initial read through the symbol tables needs to worry @@ -2400,10 +2400,10 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, struct block *block; if (outermost_context_p ()) - { + { lbrac_mismatch_complaint (symnum); - break; - } + break; + } /* The following check is added before recording line 0 at end of function so as to handle hand-generated stabs diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 8cdfac79805..4b78add0a5a 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -1649,7 +1649,7 @@ struct index_wip_file const char *suffix) { filename = (std::string (dir) + SLASH_STRING + basename - + suffix); + + suffix); filename_temp = make_temp_filename (filename); diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c index c1f1027fbee..098df173c08 100644 --- a/gdb/frv-linux-tdep.c +++ b/gdb/frv-linux-tdep.c @@ -200,19 +200,19 @@ frv_linux_sigcontext_reg_addr (struct frame_info *this_frame, int regno, else if (tramp_type == RT_SIGTRAMP) { /* For a realtime sigtramp frame, SP + 12 contains a pointer - to a ucontext struct. The ucontext struct contains a - sigcontext struct starting 24 bytes in. (The offset of - uc_mcontext within struct ucontext is derived as follows: - stack_t is a 12-byte struct and struct sigcontext is - 8-byte aligned. This gives an offset of 8 + 12 + 4 (for - padding) = 24.) */ + to a ucontext struct. The ucontext struct contains a + sigcontext struct starting 24 bytes in. (The offset of + uc_mcontext within struct ucontext is derived as follows: + stack_t is a 12-byte struct and struct sigcontext is + 8-byte aligned. This gives an offset of 8 + 12 + 4 (for + padding) = 24.) */ if (target_read_memory (sp + 12, buf, sizeof buf) != 0) { warning (_("Can't read realtime sigtramp frame.")); return 0; } sc_addr = extract_unsigned_integer (buf, sizeof buf, byte_order); - sc_addr += 24; + sc_addr += 24; } else internal_error (__FILE__, __LINE__, _("not a signal trampoline")); diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h index 962fee18511..1773aa33607 100644 --- a/gdb/gnu-nat.h +++ b/gdb/gnu-nat.h @@ -165,8 +165,8 @@ private: void inf_validate_task_sc (struct inf *inf); void inf_restore_exc_ports (struct inf *inf); void inf_set_threads_resume_sc (struct inf *inf, - struct proc *run_thread, - int run_others); + struct proc *run_thread, + int run_others); int inf_set_threads_resume_sc_for_signal_thread (struct inf *inf); void inf_resume (struct inf *inf); void inf_set_step_thread (struct inf *inf, struct proc *proc); diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 70a518ed102..21e58f3c392 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -2156,9 +2156,9 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache) if (get_frame_pc (this_frame) >= prologue_end && (u->Save_SP || u->alloca_frame) && fp != 0) { - cache->base = fp; + cache->base = fp; - if (hppa_debug) + if (hppa_debug) fprintf_unfiltered (gdb_stdlog, " (base=%s) [frame pointer]", paddress (gdbarch, cache->base)); } @@ -2976,7 +2976,7 @@ hppa_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) if (in_plt_section (pc)) { /* Sanity check: are we pointing to the PLT stub? */ - if (!hppa_match_insns (gdbarch, pc, hppa_plt_stub, insn)) + if (!hppa_match_insns (gdbarch, pc, hppa_plt_stub, insn)) { warning (_("Cannot resolve PLT stub at %s."), paddress (gdbarch, pc)); diff --git a/gdb/i386-fbsd-nat.c b/gdb/i386-fbsd-nat.c index 76c760940a0..f15fd625b12 100644 --- a/gdb/i386-fbsd-nat.c +++ b/gdb/i386-fbsd-nat.c @@ -73,14 +73,14 @@ i386_fbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signal) ULONGEST eflags; /* Workaround for a bug in FreeBSD. Make sure that the trace - flag is off when doing a continue. There is a code path - through the kernel which leaves the flag set when it should - have been cleared. If a process has a signal pending (such - as SIGALRM) and we do a PT_STEP, the process never really has - a chance to run because the kernel needs to notify the - debugger that a signal is being sent. Therefore, the process - never goes through the kernel's trap() function which would - normally clear it. */ + flag is off when doing a continue. There is a code path + through the kernel which leaves the flag set when it should + have been cleared. If a process has a signal pending (such + as SIGALRM) and we do a PT_STEP, the process never really has + a chance to run because the kernel needs to notify the + debugger that a signal is being sent. Therefore, the process + never goes through the kernel's trap() function which would + normally clear it. */ regcache_cooked_read_unsigned (regcache, I386_EFLAGS_REGNUM, &eflags); diff --git a/gdb/i386-linux-tdep.h b/gdb/i386-linux-tdep.h index f1de4ccbb1c..7d7b464f8d9 100644 --- a/gdb/i386-linux-tdep.h +++ b/gdb/i386-linux-tdep.h @@ -47,7 +47,7 @@ extern void i386_linux_report_signal_info (struct gdbarch *gdbarch, extern const struct target_desc *i386_linux_read_description (uint64_t xcr0); /* Format of XSAVE extended state is: - struct + struct { fxsave_bytes[0..463] sw_usable_bytes[464..511] diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 7f9405ce3dd..973085ef337 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1276,8 +1276,8 @@ i386_analyze_stack_align (CORE_ADDR pc, CORE_ADDR current_pc, "andl $-XXX, %esp" can be either 3 bytes or 6 bytes: - 0x83 0xe4 0xf0 andl $-16, %esp - 0x81 0xe4 0x00 0xff 0xff 0xff andl $-256, %esp + 0x83 0xe4 0xf0 andl $-16, %esp + 0x81 0xe4 0x00 0xff 0xff 0xff andl $-256, %esp */ gdb_byte buf[14]; @@ -1941,20 +1941,20 @@ i386_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) gdb_byte buf[4]; if (target_read_code (pc + 1, buf, sizeof buf) == 0) - { + { /* Make sure address is computed correctly as a 32bit integer even if CORE_ADDR is 64 bit wide. */ - struct bound_minimal_symbol s; - CORE_ADDR call_dest; + struct bound_minimal_symbol s; + CORE_ADDR call_dest; call_dest = pc + 5 + extract_signed_integer (buf, 4, byte_order); call_dest = call_dest & 0xffffffffU; - s = lookup_minimal_symbol_by_pc (call_dest); - if (s.minsym != NULL - && s.minsym->linkage_name () != NULL - && strcmp (s.minsym->linkage_name (), "__main") == 0) - pc += 5; - } + s = lookup_minimal_symbol_by_pc (call_dest); + if (s.minsym != NULL + && s.minsym->linkage_name () != NULL + && strcmp (s.minsym->linkage_name (), "__main") == 0) + pc += 5; + } } return pc; diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 3cb05e564c3..38947ca265e 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1472,7 +1472,7 @@ get_return_value (struct value *function, struct type *value_type) calls are made async, this will likely be made the norm. */ switch (gdbarch_return_value (gdbarch, function, value_type, - NULL, NULL, NULL)) + NULL, NULL, NULL)) { case RETURN_VALUE_REGISTER_CONVENTION: case RETURN_VALUE_ABI_RETURNS_ADDRESS: diff --git a/gdb/infrun.c b/gdb/infrun.c index 427c694bb76..e9624d2a9b6 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -7248,7 +7248,7 @@ process_event_stop_test (struct execution_control_state *ecs) bool refresh_step_info = true; if ((ecs->event_thread->suspend.stop_pc == stop_pc_sal.pc) && (ecs->event_thread->current_line != stop_pc_sal.line - || ecs->event_thread->current_symtab != stop_pc_sal.symtab)) + || ecs->event_thread->current_symtab != stop_pc_sal.symtab)) { /* We are at a different line. */ diff --git a/gdb/macroscope.c b/gdb/macroscope.c index e2abdd1bdde..eb1eac20af7 100644 --- a/gdb/macroscope.c +++ b/gdb/macroscope.c @@ -121,8 +121,8 @@ default_macro_scope (void) symbol files loaded, then get_current_or_default would raise an error. But `set width' shouldn't raise an error just because it can't decide which scope to macro-expand its argument in. */ - struct symtab_and_line cursal = - get_current_source_symtab_and_line (); + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); sal.symtab = cursal.symtab; sal.line = cursal.line; diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c index e789f4cbf01..e386bacdcf2 100644 --- a/gdb/mi/mi-cmd-disas.c +++ b/gdb/mi/mi-cmd-disas.c @@ -202,6 +202,6 @@ mi_cmd_disassemble (const char *command, char **argv, int argc) } gdb_disassembly (gdbarch, uiout, - disasm_flags, + disasm_flags, how_many, low, high); } diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 61bc169304b..38f1cb80b86 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -701,7 +701,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values, break; case VAROBJ_INVALID: uiout->field_string ("in_scope", "invalid"); - break; + break; } if (r.status != VAROBJ_INVALID) diff --git a/gdb/mips-netbsd-tdep.c b/gdb/mips-netbsd-tdep.c index 21ab43c4620..a32ae5e3a29 100644 --- a/gdb/mips-netbsd-tdep.c +++ b/gdb/mips-netbsd-tdep.c @@ -266,7 +266,7 @@ mipsnbsd_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc) jb_addr = get_frame_register_unsigned (frame, MIPS_A0_REGNUM); if (target_read_memory (jb_addr + NBSD_MIPS_JB_OFFSET (gdbarch), buf, - NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch))) + NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch))) return 0; *pc = extract_unsigned_integer (buf, NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch), diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 31cac9384e9..dbace121250 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -4284,7 +4284,7 @@ heuristic-fence-post' command.\n", /* On MIPS16, any one of the following is likely to be the start of a function: - extend save + extend save save entry addiu sp,-n diff --git a/gdb/nat/linux-namespaces.c b/gdb/nat/linux-namespaces.c index 801a81b5f8c..0c4fadd49f7 100644 --- a/gdb/nat/linux-namespaces.c +++ b/gdb/nat/linux-namespaces.c @@ -771,15 +771,15 @@ mnsh_maybe_mourn_peer (void) #define mnsh_send_open(helper, filename, flags, mode) \ mnsh_send_message (helper->sock, MNSH_REQ_OPEN, -1, flags, mode, \ - filename, strlen (filename) + 1) + filename, strlen (filename) + 1) #define mnsh_send_unlink(helper, filename) \ mnsh_send_message (helper->sock, MNSH_REQ_UNLINK, -1, 0, 0, \ - filename, strlen (filename) + 1) + filename, strlen (filename) + 1) #define mnsh_send_readlink(helper, filename) \ mnsh_send_message (helper->sock, MNSH_REQ_READLINK, -1, 0, 0, \ - filename, strlen (filename) + 1) + filename, strlen (filename) + 1) /* Receive a message from the helper. Issue an assertion failure if the message isn't a correctly-formatted MNSH_RET_INT. Set RESULT diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c index 7ef959be571..b4eb7bf6d27 100644 --- a/gdb/nat/x86-dregs.c +++ b/gdb/nat/x86-dregs.c @@ -252,7 +252,7 @@ Invalid hardware breakpoint type %d in x86_length_and_rw_bits.\n"), return (DR_LEN_4 | rw); case 8: if (TARGET_HAS_DR_LEN_8) - return (DR_LEN_8 | rw); + return (DR_LEN_8 | rw); /* FALL THROUGH */ default: internal_error (__FILE__, __LINE__, _("\ diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c index 5d4ab5dc071..8fd3695da2d 100644 --- a/gdb/nios2-tdep.c +++ b/gdb/nios2-tdep.c @@ -1375,7 +1375,7 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc, /* ORHI rb, ra, uimm (also used for MOVHI) */ if (rb != 0) { - value[rb].reg = (value[ra].reg == 0) ? 0 : -1; + value[rb].reg = (value[ra].reg == 0) ? 0 : -1; value[rb].offset = value[ra].offset | (uimm << 16); } } diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 41b436cfa27..1d21153bb4c 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -1142,7 +1142,7 @@ nto_procfs_target::mourn_inferior () the string "a b c d", and as output it would fill in argv with the four arguments "a", "b", "c", "d". The only additional functionality is simple quoting. The gdb command: - run a "b c d" f + run a "b c d" f will fill in argv with the three args "a", "b c d", "e". */ static void breakup_args (char *scratch, char **argv) diff --git a/gdb/p-lang.c b/gdb/p-lang.c index 1d8e9408e54..3dcc75a4c83 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -109,7 +109,7 @@ pascal_is_string_type (struct type *type,int *length_pos, int *length_size, *string_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT; if (char_type) *char_type = TYPE_TARGET_TYPE (type->field (1).type ()); - if (arrayname) + if (arrayname) *arrayname = TYPE_FIELD_NAME (type, 1); return 2; }; @@ -135,7 +135,7 @@ pascal_is_string_type (struct type *type,int *length_pos, int *length_size, if ((*char_type)->code () == TYPE_CODE_ARRAY) *char_type = TYPE_TARGET_TYPE (*char_type); } - if (arrayname) + if (arrayname) *arrayname = TYPE_FIELD_NAME (type, 2); return 3; }; diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c index c83d47c258a..3abb9877e80 100644 --- a/gdb/ppc-sysv-tdep.c +++ b/gdb/ppc-sysv-tdep.c @@ -1326,7 +1326,7 @@ ppc64_sysv_abi_push_freg (struct gdbarch *gdbarch, && type->code () == TYPE_CODE_FLT) { /* Floats and doubles go in f1 .. f13. 32-bit floats are converted - to double first. */ + to double first. */ if (argpos->regcache && argpos->freg <= 13) { int regnum = tdep->ppc_fp0_regnum + argpos->freg; diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 7eba2993fb2..22fa5c074d1 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -508,7 +508,7 @@ print_scalar_formatted (const gdb_byte *valaddr, struct type *type, opts.format = 0; if (type->is_unsigned ()) type = builtin_type (gdbarch)->builtin_true_unsigned_char; - else + else type = builtin_type (gdbarch)->builtin_true_char; value_print (value_from_longest (type, *val_long), stream, &opts); diff --git a/gdb/record-full.c b/gdb/record-full.c index e3b8abc4929..9e157c6e048 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -1236,11 +1236,11 @@ record_full_wait_1 (struct target_ops *ops, if (!record_full_message_wrapper_safe (regcache, GDB_SIGNAL_0)) - { + { status->kind = TARGET_WAITKIND_STOPPED; status->value.sig = GDB_SIGNAL_0; break; - } + } process_stratum_target *proc_target = current_inferior ()->process_target (); diff --git a/gdb/regcache.c b/gdb/regcache.c index 2d50f3efc85..fde0c612975 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -2102,13 +2102,13 @@ _initialize_regcache () #if GDB_SELF_TEST selftests::register_test ("get_thread_arch_aspace_regcache", - selftests::get_thread_arch_aspace_regcache_test); + selftests::get_thread_arch_aspace_regcache_test); selftests::register_test ("registers_changed_ptid_all", selftests::registers_changed_ptid_all_test); selftests::register_test ("registers_changed_ptid_target", - selftests::registers_changed_ptid_target_test); + selftests::registers_changed_ptid_target_test); selftests::register_test ("registers_changed_ptid_target_pid", - selftests::registers_changed_ptid_target_pid_test); + selftests::registers_changed_ptid_target_pid_test); selftests::register_test ("registers_changed_ptid_target_ptid", selftests::registers_changed_ptid_target_ptid_test); diff --git a/gdb/remote.c b/gdb/remote.c index 9a6dd33634f..9b465d77343 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -9790,7 +9790,7 @@ remote_target::read_frame (gdb::char_vector *buf_p) { int repeat; - csum += c; + csum += c; c = readchar (remote_timeout); csum += c; repeat = c - ' ' + 3; /* Compute repeat count. */ diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index d45a15c16ca..ed73f90316a 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1872,12 +1872,12 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, continue; } else if ((op & 0xffff0000) == 0x38210000) - { /* addi r1,r1,SIMM */ - fdata->frameless = 0; - fdata->offset += SIGNED_SHORT (op); - offset = fdata->offset; - continue; - } + { /* addi r1,r1,SIMM */ + fdata->frameless = 0; + fdata->offset += SIGNED_SHORT (op); + offset = fdata->offset; + continue; + } /* Load up minimal toc pointer. Do not treat an epilogue restore of r31 as a minimal TOC load. */ else if (((op >> 22) == 0x20f || /* l r31,... or l r30,... */ @@ -1890,7 +1890,7 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, /* move parameters from argument registers to local variable registers */ - } + } else if ((op & 0xfc0007fe) == 0x7c000378 && /* mr(.) Rx,Ry */ (((op >> 21) & 31) >= 3) && /* R3 >= Ry >= R10 */ (((op >> 21) & 31) <= 10) && @@ -2081,7 +2081,7 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, } continue; - } + } /* Store gen register S at (r31+r0). Store param on stack when offset from SP bigger than 4 bytes. */ /* 000100 sssss 11111 00000 01100100000 */ diff --git a/gdb/serial.c b/gdb/serial.c index 719cd66c08c..7d1bc535ed9 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -284,7 +284,7 @@ serial_fdopen_ops (const int fd, const struct serial_ops *ops) { ops = serial_interface_lookup ("terminal"); if (!ops) - ops = serial_interface_lookup ("hardwire"); + ops = serial_interface_lookup ("hardwire"); } if (!ops) diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 31d912db018..4dd5d9fbb30 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1406,8 +1406,8 @@ sh_return_value_nofpu (struct gdbarch *gdbarch, struct value *function, { struct type *func_type = function ? value_type (function) : NULL; - if (sh_use_struct_convention_nofpu ( - sh_is_renesas_calling_convention (func_type), type)) + if (sh_use_struct_convention_nofpu + (sh_is_renesas_calling_convention (func_type), type)) return RETURN_VALUE_STRUCT_CONVENTION; if (writebuf) sh_store_return_value_nofpu (type, regcache, writebuf); diff --git a/gdb/source.c b/gdb/source.c index 94e61cc79a6..c993e25a892 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1322,7 +1322,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, uiout->field_string ("file", symtab_to_filename_for_display (s), file_name_style.style ()); if (uiout->is_mi_like_p () || !uiout->test_flags (ui_source_list)) - { + { const char *s_fullname = symtab_to_fullname (s); char *local_fullname; @@ -1333,7 +1333,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, strcpy (local_fullname, s_fullname); uiout->field_string ("fullname", local_fullname); - } + } uiout->text ("\n"); } diff --git a/gdb/stabsread.c b/gdb/stabsread.c index d83f4b40a6a..72cb351d2f8 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -3001,7 +3001,7 @@ read_struct_fields (struct stab_field_info *fip, const char **pp, the type for the base class, and a terminating semicolon. A typical example, with two base classes, would be "!2,020,19;0264,21;". - ^^ ^ ^ ^ ^ ^ ^ + ^^ ^ ^ ^ ^ ^ ^ Baseclass information marker __________________|| | | | | | | Number of baseclasses __________________________| | | | | | | Visibility specifiers (2) ________________________| | | | | | diff --git a/gdb/stack.c b/gdb/stack.c index a38fa4d8082..aa20018ad9f 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2769,7 +2769,7 @@ return_command (const char *retval_exp, int from_tty) if (thisfun != NULL) return_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (thisfun)); if (return_type == NULL) - { + { if (retval_expr->first_opcode () != UNOP_CAST && retval_expr->first_opcode () != UNOP_CAST_TYPE) error (_("Return value type not available for selected " diff --git a/gdb/stubs/sh-stub.c b/gdb/stubs/sh-stub.c index 379824c1c98..03a865eeded 100644 --- a/gdb/stubs/sh-stub.c +++ b/gdb/stubs/sh-stub.c @@ -418,10 +418,10 @@ retry: if (ch == '#') { - ch = getDebugChar (); - xmitcsum = hex (ch) << 4; - ch = getDebugChar (); - xmitcsum += hex (ch); + ch = getDebugChar (); + xmitcsum = hex (ch) << 4; + ch = getDebugChar (); + xmitcsum += hex (ch); if (checksum != xmitcsum) { @@ -437,7 +437,7 @@ retry: putDebugChar (buffer[0]); putDebugChar (buffer[1]); - return &buffer[3]; + return &buffer[3]; } return &buffer[0]; diff --git a/gdb/stubs/sparc-stub.c b/gdb/stubs/sparc-stub.c index 24631cebc43..acb7743184d 100644 --- a/gdb/stubs/sparc-stub.c +++ b/gdb/stubs/sparc-stub.c @@ -204,7 +204,7 @@ window_fine: recursive_trap: st %l5, [%lo(in_trap_handler) + %l4] sub %sp,(16+1+6+1+72)*4,%sp ! Make room for input & locals - ! + hidden arg + arg spill + ! + hidden arg + arg spill ! + doubleword alignment ! + registers[72] local var diff --git a/gdb/symfile.c b/gdb/symfile.c index b2034c6e0c3..5ae3093095c 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -415,7 +415,7 @@ relative_addr_info_to_section_offsets (section_offsets §ion_offsets, osp = &addrs[i]; if (osp->sectindex == -1) - continue; + continue; /* Record all sections in offsets. */ /* The section_offsets in the objfile are here filled in using diff --git a/gdb/symtab.c b/gdb/symtab.c index cacf2d3c555..5ad1c8a817d 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1609,7 +1609,7 @@ maintenance_print_symbol_cache_statistics (const char *args, int from_tty) /* If the cache hasn't been created yet, avoid creating one. */ cache = symbol_cache_key.get (pspace); if (cache == NULL) - printf_filtered (" empty, no stats available\n"); + printf_filtered (" empty, no stats available\n"); else symbol_cache_stats (cache); } diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index f88968afbcf..83a32ec8252 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2388,7 +2388,7 @@ tfind_line_command (const char *args, int from_tty) if (sal.line > 0 && find_line_pc_range (sal, &start_pc, &end_pc)) { if (start_pc == end_pc) - { + { printf_filtered ("Line %d of \"%s\"", sal.line, symtab_to_filename_for_display (sal.symtab)); @@ -2403,9 +2403,9 @@ tfind_line_command (const char *args, int from_tty) && start_pc != end_pc) printf_filtered ("Attempting to find line %d instead.\n", sal.line); - else + else error (_("Cannot find a good line.")); - } + } } else { diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 22f8b7a2028..05d95ea7d6a 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2600,7 +2600,7 @@ windows_nat_target::create_inferior (const char *exec_file, { sh = get_shell (); if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, sh, shell, __PMAX) < 0) - error (_("Error starting executable via shell: %d"), errno); + error (_("Error starting executable via shell: %d"), errno); #ifdef __USEWIDE len = sizeof (L" -c 'exec '") + mbstowcs (NULL, exec_file, 0) + mbstowcs (NULL, allargs, 0) + 2; diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index d1c24a16f2a..246921253d2 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -768,7 +768,7 @@ xtensa_coprocessor_register_group (struct reggroup *group) static int xtensa_register_reggroup_p (struct gdbarch *gdbarch, int regnum, - struct reggroup *group) + struct reggroup *group) { xtensa_register_t* reg = &gdbarch_tdep (gdbarch)->regmap[regnum]; xtensa_register_type_t type = reg->type; @@ -2852,7 +2852,7 @@ execute_code (struct gdbarch *gdbarch, CORE_ADDR current_pc, CORE_ADDR wb) xtensa_write_register (arreg, a7_saved); } return xtWindowUnderflow; - default: /* Simply skip this insns. */ + default: /* Simply skip this insns. */ continue; } @@ -2965,7 +2965,7 @@ Unable to decode Xtensa Window Interrupt Handler's code.")); int main() { int local_var = 1; - .... + .... } because, for this source code, both Xtensa compilers will generate two -- 2.30.2