From patchwork Thu Jun 25 08:35:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 7345 Received: (qmail 78117 invoked by alias); 25 Jun 2015 08:35:31 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 78107 invoked by uid 89); 25 Jun 2015 08:35:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 25 Jun 2015 08:35:29 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 1867C363630; Thu, 25 Jun 2015 08:35:28 +0000 (UTC) Received: from blade.nx (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5P8ZR27002942; Thu, 25 Jun 2015 04:35:27 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id AD489262979; Thu, 25 Jun 2015 09:35:26 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Mike Frysinger Subject: [OB PATCH] Remove gdb_sysroot NULL checks Date: Thu, 25 Jun 2015 09:35:26 +0100 Message-Id: <1435221326-28053-1-git-send-email-gbenson@redhat.com> In-Reply-To: <20150624103025.GA11787@blade.nx> References: <20150624103025.GA11787@blade.nx> X-IsSubscribed: yes Hi all, Since fed040c6a50399617d8265cbddc7fd21b3f134ef gdb_sysroot is never NULL. This commit removes all gdb_sysroot NULL checks. Pushed as obvious. Cheers, Gary --- gdb/ChangeLog: * exec.c (exec_file_locate_attach): Remove gdb_sysroot NULL check. * infrun.c (follow_exec): Likewise. * remote.c (remote_filesystem_is_local): Likewise. * solib.c (solib_find_1): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/exec.c | 3 +-- gdb/infrun.c | 2 +- gdb/remote.c | 3 +-- gdb/solib.c | 29 ++++++++++++----------------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gdb/exec.c b/gdb/exec.c index 8a4ab6f..3dfc437 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -154,8 +154,7 @@ exec_file_locate_attach (int pid, int from_tty) /* If gdb_sysroot is not empty and the discovered filename is absolute then prefix the filename with gdb_sysroot. */ - if (gdb_sysroot != NULL && *gdb_sysroot != '\0' - && IS_ABSOLUTE_PATH (exec_file)) + if (*gdb_sysroot != '\0' && IS_ABSOLUTE_PATH (exec_file)) full_exec_path = exec_file_find (exec_file, NULL); if (full_exec_path == NULL) diff --git a/gdb/infrun.c b/gdb/infrun.c index 233d0f8..792f847 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1133,7 +1133,7 @@ follow_exec (ptid_t ptid, char *execd_pathname) breakpoint_init_inferior (inf_execd); - if (gdb_sysroot != NULL && *gdb_sysroot != '\0') + if (*gdb_sysroot != '\0') { char *name = exec_file_find (execd_pathname, NULL); diff --git a/gdb/remote.c b/gdb/remote.c index f15d75e..68dd99d 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -10538,8 +10538,7 @@ remote_filesystem_is_local (struct target_ops *self) this case we treat the remote filesystem as local if the sysroot is exactly TARGET_SYSROOT_PREFIX and if the stub does not support vFile:open. */ - if (gdb_sysroot != NULL - && strcmp (gdb_sysroot, TARGET_SYSROOT_PREFIX) == 0) + if (strcmp (gdb_sysroot, TARGET_SYSROOT_PREFIX) == 0) { enum packet_support ps = packet_support (PACKET_vFile_open); diff --git a/gdb/solib.c b/gdb/solib.c index 0010c2f..ed1bc25 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -159,23 +159,18 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib) struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); char *sysroot = gdb_sysroot; - if (sysroot != NULL) - { - /* If the absolute prefix starts with "target:" but the - filesystem accessed by the target_fileio_* methods - is the local filesystem then we strip the "target:" - prefix now and work with the local filesystem. This - ensures that the same search algorithm is used for - all local files regardless of whether a "target:" - prefix was used. */ - if (is_target_filename (sysroot) && target_filesystem_is_local ()) - sysroot += strlen (TARGET_SYSROOT_PREFIX); - - if (*sysroot == '\0') - sysroot = NULL; - } - - if (sysroot != NULL) + /* If the absolute prefix starts with "target:" but the filesystem + accessed by the target_fileio_* methods is the local filesystem + then we strip the "target:" prefix now and work with the local + filesystem. This ensures that the same search algorithm is used + for all local files regardless of whether a "target:" prefix was + used. */ + if (is_target_filename (sysroot) && target_filesystem_is_local ()) + sysroot += strlen (TARGET_SYSROOT_PREFIX); + + if (*sysroot == '\0') + sysroot = NULL; + else { int prefix_len = strlen (sysroot);