From 7b323785ef83a7d6f023909fe21b7983651c3f27 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 5 Feb 2024 15:18:33 -0500 Subject: gdb: rename struct shobj -> struct solib `struct so_list` was recently renamed to `struct shobj` (in 3fe0dfd1604f ("gdb: rename struct so_list to shobj")). In hindsight, `solib` would have been a better name. We have solib.c, the implementations in solib-*.c, many functions with solib in their name, the solib_loaded / solib_unloaded observables, etc. Rename shobj to solib. Change-Id: I0af1c7a9b29bdda027e9af633f6d37e1cfcacd5d Approved-By: Tom Tromey --- gdb/mi/mi-cmd-file.c | 2 +- gdb/mi/mi-interp.c | 6 +++--- gdb/mi/mi-interp.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gdb/mi') diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c index 91e5272..95128a9 100644 --- a/gdb/mi/mi-cmd-file.c +++ b/gdb/mi/mi-cmd-file.c @@ -163,7 +163,7 @@ mi_cmd_file_list_shared_libraries (const char *command, /* Print the table header. */ ui_out_emit_list list_emitter (uiout, "shared-libraries"); - for (const shobj &so : current_program_space->solibs ()) + for (const solib &so : current_program_space->solibs ()) { if (so.so_name.empty ()) continue; diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 21d5305..38ae227 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -724,7 +724,7 @@ mi_interp::on_target_resumed (ptid_t ptid) /* See mi-interp.h. */ void -mi_output_solib_attribs (ui_out *uiout, const shobj &solib) +mi_output_solib_attribs (ui_out *uiout, const solib &solib) { gdbarch *gdbarch = current_inferior ()->arch (); @@ -745,7 +745,7 @@ mi_output_solib_attribs (ui_out *uiout, const shobj &solib) } void -mi_interp::on_solib_loaded (const shobj &solib) +mi_interp::on_solib_loaded (const solib &solib) { ui_out *uiout = this->interp_ui_out (); @@ -762,7 +762,7 @@ mi_interp::on_solib_loaded (const shobj &solib) } void -mi_interp::on_solib_unloaded (const shobj &solib) +mi_interp::on_solib_unloaded (const solib &solib) { ui_out *uiout = this->interp_ui_out (); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 9bb6b95..cd48fcf 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -60,8 +60,8 @@ public: void on_record_changed (inferior *inf, int started, const char *method, const char *format) override; void on_target_resumed (ptid_t ptid) override; - void on_solib_loaded (const shobj &so) override; - void on_solib_unloaded (const shobj &so) override; + void on_solib_loaded (const solib &so) override; + void on_solib_unloaded (const solib &so) override; void on_about_to_proceed () override; void on_traceframe_changed (int tfnum, int tpnum) override; void on_tsv_created (const trace_state_variable *tsv) override; @@ -108,7 +108,7 @@ public: /* Output the shared object attributes to UIOUT. */ -void mi_output_solib_attribs (ui_out *uiout, const shobj &solib); +void mi_output_solib_attribs (ui_out *uiout, const solib &solib); /* Returns the INTERP's data cast as mi_interp if INTERP is an MI, and returns NULL otherwise. */ -- cgit v1.1