From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 3AA623857721 for ; Wed, 6 Sep 2023 19:29:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3AA623857721 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com Received: from localhost.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 8E8AE1E092; Wed, 6 Sep 2023 15:29:17 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/2] gdb: remove interp_pre_command_loop Date: Wed, 6 Sep 2023 15:29:09 -0400 Message-ID: <20230906192916.210156-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1173.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: It is a trivial wrapper around the pre_command_loop method, remove it. Change-Id: Idb2c61f9b68988528006a9a9b2b528f43781eef4 --- gdb/interps.c | 10 ---------- gdb/interps.h | 4 ---- gdb/main.c | 2 +- gdb/ui.c | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 7baa8491eb19..fa294dfa1a3d 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -262,16 +262,6 @@ command_interp (void) return current_ui->current_interpreter; } -/* See interps.h. */ - -void -interp_pre_command_loop (struct interp *interp) -{ - gdb_assert (interp != NULL); - - interp->pre_command_loop (); -} - /* See interp.h */ int diff --git a/gdb/interps.h b/gdb/interps.h index c041d0d95b61..95a885d1b691 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -261,10 +261,6 @@ extern void clear_interpreter_hooks (void); if it uses GDB's own simplified form of readline. */ extern int interp_supports_command_editing (struct interp *interp); -/* Called before starting an event loop, to give the interpreter a - chance to e.g., print a prompt. */ -extern void interp_pre_command_loop (struct interp *interp); - /* List the possible interpreters which could complete the given text. */ extern void interpreter_completer (struct cmd_list_element *ignore, diff --git a/gdb/main.c b/gdb/main.c index 3e93f5839472..cf46f6acb208 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -470,7 +470,7 @@ captured_command_loop () /* Give the interpreter a chance to print a prompt, if necessary */ if (ui->prompt_state != PROMPT_BLOCKED) - interp_pre_command_loop (top_level_interpreter ()); + top_level_interpreter ()->pre_command_loop (); /* Now it's time to start the event loop. */ start_event_loop (); diff --git a/gdb/ui.c b/gdb/ui.c index 5fe001262a83..38ec61ea6731 100644 --- a/gdb/ui.c +++ b/gdb/ui.c @@ -227,7 +227,7 @@ new_ui_command (const char *args, int from_tty) set_top_level_interpreter (interpreter_name); - interp_pre_command_loop (top_level_interpreter ()); + top_level_interpreter ()->pre_command_loop (); /* Make sure the file is not closed. */ stream.release (); base-commit: 313b2841b8e9046ea658104988e01bedf6148d5f -- 2.42.0