From 4a099de2e7e5374d633ba0eab4273b6f5c81ba74 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 21 Jan 2016 12:56:25 +0100 Subject: [PATCH] gdb: Small cleanup to disasm.c:maybe_add_dis_line_entry Give the function a better name (drop "maybe_") and update the header comment. gdb/ChangeLog: * disasm.c (maybe_add_dis_line_entry): Rename to... (add_dis_line_entry): ...this, and update header comment. (do_mixed_source_and_assembly): Now use add_dis_line_entry. --- gdb/ChangeLog | 6 ++++++ gdb/disasm.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 68d10ad0ac..45d8ef906f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-01-21 Andrew Burgess + + * disasm.c (maybe_add_dis_line_entry): Rename to... + (add_dis_line_entry): ...this, and update header comment. + (do_mixed_source_and_assembly): Now use add_dis_line_entry. + 2016-01-21 Pedro Alves * Makefile.in (COMPILER_CFLAGS): New. diff --git a/gdb/disasm.c b/gdb/disasm.c index 9405928643..1cf0901cf8 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -86,11 +86,10 @@ allocate_dis_line_table (void) xfree, xcalloc, xfree); } -/* Add DLE to TABLE. - Returns 1 if added, 0 if already present. */ +/* Add a new dis_line_entry containing SYMTAB and LINE to TABLE. */ static void -maybe_add_dis_line_entry (htab_t table, struct symtab *symtab, int line) +add_dis_line_entry (htab_t table, struct symtab *symtab, int line) { void **slot; struct dis_line_entry dle, *dlep; @@ -552,7 +551,7 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout, pc += length; if (sal.symtab != NULL) - maybe_add_dis_line_entry (dis_line_table, sal.symtab, sal.line); + add_dis_line_entry (dis_line_table, sal.symtab, sal.line); } /* Second pass: print the disassembly.