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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 68d10ad0acbf61b62926003127ee6fe727c4b1b1..45d8ef906f76b5ae7c9c5f29fc110c895bf584c4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-21  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * 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  <palves@redhat.com>
 
        * Makefile.in (COMPILER_CFLAGS): New.

diff --git a/gdb/disasm.c b/gdb/disasm.c
index 940592864387c83a71a977398556c18db178807a..1cf0901cf88259e032ff8c3283dcbc76ffc136cf 100644 (file)
--- 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.