From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by sourceware.org (Postfix) with ESMTPS id 898B438618BD for ; Wed, 7 Oct 2020 19:05:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 898B438618BD Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x344.google.com with SMTP id k18so3703875wmj.5 for ; Wed, 07 Oct 2020 12:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UVzqTZuk8VkL3FmwHQdbeOZUJsbYA+wES/cfcBHB+b8=; b=cVUaCDS+Jv379mtx18e5Naz2vVFvN62LCQcESOAL70yFTv71/C6ZU347ZtostgXMu5 TJ/2iGLyrsHcdq55QiB4sPrvj/zLSeBUsqaCdjU+zfSNUAiGUrhQNyU6zxuZhrKula+k mXUy4PIua+q0ng6IsDrtoSuLTP/Z/vHNGBbsCUO2FXgoSCT+B+mOFl82sRixcnrVmdxy 9rmfiqDyKhs3IDO5+gHv1Ey4QUaojn1YS1LRNRrs7bv/PJdLjYgashYhBrNB95YUQR1P 7E4C5wBu9YgEpSUHbMFJ2VH5G3u//XXzgrFkXyC0CfYnLX6FXkGVgCHFJY8dMoZOMep5 S3wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UVzqTZuk8VkL3FmwHQdbeOZUJsbYA+wES/cfcBHB+b8=; b=COQ3AN9yY3DFBt4bzZ64cl1f7oHovuHtLnGrRyQabyt+oRoTtO/Mcsm8SAkFprmeWS o17slbhta6miQDPbsy1jtSIL8rrx1S4Rn7ixft6sTY++dnryPddWRq9/UVugpRPnGodm 5R3kYgb6QvrFz4uCDkyjaxiBiMeu0p48U+V6ITbrqhBaqD6iolYKenBIIUwmgULDpx6+ FaT/6m0W4R5r2W/8xNxG59k6uSNPXuzYPa4QXz304jXbYIr+Oonj0/Rqc5eEjQSEH971 TDD288Eh4CCHBZ7JzV4LSyr3ptIK//l8at2cyRAqMuQdxdy2oawr9K/ysj3uDRdBwVPP ZCdw== X-Gm-Message-State: AOAM5328i8puqeuk7wqL7CFt8JCZF6/vKIIovzRG4lG4wcfpFEBWBivx q702JuSLQ2PKA+PWVfdmR9pJA95qt/lg0A== X-Google-Smtp-Source: ABdhPJyeMMCwogg+hPKniX61KYpZk/7T5El7si5LnPjICeiicCh3kZtfw4MaomhiDbeIqUuAHxcKqA== X-Received: by 2002:a7b:c401:: with SMTP id k1mr4706320wmi.120.1602097528996; Wed, 07 Oct 2020 12:05:28 -0700 (PDT) Received: from localhost (host109-151-14-50.range109-151.btcentralplus.com. [109.151.14.50]) by smtp.gmail.com with ESMTPSA id t5sm4126748wrb.21.2020.10.07.12.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 12:05:28 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Tom Tromey , Andrew Burgess Subject: [PATCH 3/7] gdb: new function to wrap up executing command line scripts/commands Date: Wed, 7 Oct 2020 21:05:07 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2020 19:05:34 -0000 Small refactor to wrap up executing the scripts and commands passed using the -x, -ex, -ix, -iex command line flags. There should be no user visible changes after this commit. gdb/ChangeLog: * main.c (execute_cmdargs): New function. (captured_main_1): Make use of execute_cmdargs. --- gdb/ChangeLog | 5 +++++ gdb/main.c | 53 ++++++++++++++++++++------------------------------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/gdb/main.c b/gdb/main.c index f6377f2df28..f85b7dbfdaa 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -515,6 +515,25 @@ struct cmdarg char *string; }; +/* From CMDARG_VEC execute command files (matching FILE_TYPE) or commands + (matching CMD_TYPE). Update the value in *RET. */ + +static void +execute_cmdargs (const std::vector *cmdarg_vec, + cmdarg_kind file_type, cmdarg_kind cmd_type, + int *ret) +{ + for (const auto &cmdarg_p : *cmdarg_vec) + { + if (cmdarg_p.type == file_type) + *ret = catch_command_errors (source_script, cmdarg_p.string, + !batch_flag); + else if (cmdarg_p.type == cmd_type) + *ret = catch_command_errors (execute_command, cmdarg_p.string, + !batch_flag); + } +} + static void captured_main_1 (struct captured_main_args *context) { @@ -1069,22 +1088,7 @@ captured_main_1 (struct captured_main_args *context) ret = catch_command_errors (source_script, home_gdbinit.c_str (), 0); /* Process '-ix' and '-iex' options early. */ - for (i = 0; i < cmdarg_vec.size (); i++) - { - const struct cmdarg &cmdarg_p = cmdarg_vec[i]; - - switch (cmdarg_p.type) - { - case CMDARG_INIT_FILE: - ret = catch_command_errors (source_script, cmdarg_p.string, - !batch_flag); - break; - case CMDARG_INIT_COMMAND: - ret = catch_command_errors (execute_command, cmdarg_p.string, - !batch_flag); - break; - } - } + execute_cmdargs (&cmdarg_vec, CMDARG_INIT_FILE, CMDARG_INIT_COMMAND, &ret); /* Now perform all the actions indicated by the arguments. */ if (cdarg != NULL) @@ -1195,22 +1199,7 @@ captured_main_1 (struct captured_main_args *context) load_auto_scripts_for_objfile (objfile); /* Process '-x' and '-ex' options. */ - for (i = 0; i < cmdarg_vec.size (); i++) - { - const struct cmdarg &cmdarg_p = cmdarg_vec[i]; - - switch (cmdarg_p.type) - { - case CMDARG_FILE: - ret = catch_command_errors (source_script, cmdarg_p.string, - !batch_flag); - break; - case CMDARG_COMMAND: - ret = catch_command_errors (execute_command, cmdarg_p.string, - !batch_flag); - break; - } - } + execute_cmdargs (&cmdarg_vec, CMDARG_FILE, CMDARG_COMMAND, &ret); /* Read in the old history after all the command files have been read. */ -- 2.25.4