From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Thu, 2 Feb 2017 03:54:35 +0000 (-0500)
Subject: Remove unused file_string parameter in gdb_disassembly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a8eb317c5bce0f1ff290a9343777db74adec663;p=binutils-gdb.git

Remove unused file_string parameter in gdb_disassembly

The file_string parameter was added in 8f0eea0 (sorry, no title back
then) and has never actually been used.

gdb/ChangeLog:

	* disasm.h (gdb_disassembly): Remove file_string parameter.
	* disasm.c (gdb_disassembly): Likewise.
	* cli/cli-cmds.c (print_disassembly): Adapt.
	* mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise.
	* stack.c (do_gdb_disassembly): Likewise.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8638ebabc33..72d33e34f49 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2017-02-01  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* disasm.h (gdb_disassembly): Remove file_string parameter.
+	* disasm.c (gdb_disassembly): Likewise.
+	* cli/cli-cmds.c (print_disassembly): Adapt.
+	* mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise.
+	* stack.c (do_gdb_disassembly): Likewise.
+
 2017-02-01  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* dwarf2loc.c (dwarf2_evaluate_loc_desc_full): For
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 119f2202ce0..b5c9d0ba78c 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1148,7 +1148,7 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
 			 paddress (gdbarch, low), paddress (gdbarch, high));
 
       /* Dump the specified range.  */
-      gdb_disassembly (gdbarch, current_uiout, 0, flags, -1, low, high);
+      gdb_disassembly (gdbarch, current_uiout, flags, -1, low, high);
 
       printf_filtered ("End of assembler dump.\n");
       gdb_flush (gdb_stdout);
diff --git a/gdb/disasm.c b/gdb/disasm.c
index 897f2f1412f..9d36f151f30 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -815,7 +815,7 @@ gdb_disassembler::print_insn (CORE_ADDR memaddr,
 
 void
 gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
-		 char *file_string, int flags, int how_many,
+		 int flags, int how_many,
 		 CORE_ADDR low, CORE_ADDR high)
 {
   struct ui_file *stb = mem_fileopen ();
diff --git a/gdb/disasm.h b/gdb/disasm.h
index 7bbfa31da42..7374dbfe2dc 100644
--- a/gdb/disasm.h
+++ b/gdb/disasm.h
@@ -92,7 +92,7 @@ struct disasm_insn
 };
 
 extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
-			     char *file_string, int flags, int how_many,
+			     int flags, int how_many,
 			     CORE_ADDR low, CORE_ADDR high);
 
 /* Print the instruction at address MEMADDR in debugged memory,
diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index 2247d2c3e03..9338f7bdec4 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -187,7 +187,6 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
     }
 
   gdb_disassembly (gdbarch, uiout,
-  		   file_string,
   		   disasm_flags,
 		   how_many, low, high);
 
diff --git a/gdb/stack.c b/gdb/stack.c
index 4c9e14e48e3..f48433109a3 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -770,7 +770,7 @@ do_gdb_disassembly (struct gdbarch *gdbarch,
 
   TRY
     {
-      gdb_disassembly (gdbarch, current_uiout, 0,
+      gdb_disassembly (gdbarch, current_uiout,
 		       DISASSEMBLY_RAW_INSN, how_many,
 		       low, high);
     }