Remove gdb_sysroot NULL checks
Since fed040c6a5
gdb_sysroot is
never NULL. This commit removes all gdb_sysroot NULL checks.
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.
This commit is contained in:
parent
53f7371c77
commit
a3be80c3c5
|
@ -1,3 +1,10 @@
|
|||
2015-06-25 Gary Benson <gbenson@redhat.com>
|
||||
|
||||
* 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.
|
||||
|
||||
2015-06-24 Keith Seitz <keiths@redhat.com>
|
||||
|
||||
* build-id.c (build_id_to_debug_bfd): Add cleanup to free
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
27
gdb/solib.c
27
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 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 (*sysroot == '\0')
|
||||
sysroot = NULL;
|
||||
else
|
||||
{
|
||||
int prefix_len = strlen (sysroot);
|
||||
|
||||
|
|
Loading…
Reference in New Issue