From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id AD98D385C6D7 for ; Wed, 16 Aug 2023 15:55:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD98D385C6D7 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692201324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cI3Cd3CU0JkBnjxm7R/7Fb6D3YljBDx19oT3XqlWj0c=; b=C2RsbnSACMS6l4PJ/D/Z8Ngf1FbxWqcZH+FEqJ9kmy4WAFpRe72NMU9EzISXVQUKyP5kAH VFwQIUdgNQ3vUsa1uLpOkHo0gbRlbSaNS/e/BVV4fvtMGhwKA82fIX974fV2+zqFhPQ5gR Nl6kw/HWPtz+bun7cwG0eGS3i6hcUrE= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-Ar0nkz67MOqhRIVCruTIqg-1; Wed, 16 Aug 2023 11:55:20 -0400 X-MC-Unique: Ar0nkz67MOqhRIVCruTIqg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99bdee94b84so837135566b.0 for ; Wed, 16 Aug 2023 08:55:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692201318; x=1692806118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cI3Cd3CU0JkBnjxm7R/7Fb6D3YljBDx19oT3XqlWj0c=; b=CrkBwNGI+vHjdXUivBtuP04S47ikWNg00BZ8TSXdZBJSuZfJkBTPmuTGEm4su2vUb9 uBPImdjAygaV92nDFABE+9EpOPZzrZDfJdleDbe115YgA0CClojwg2ND02e9rZ+VKHbm EKrzAQ4uWKQi02lfkdVrXkzBSq0clgkTm9PU5l82fCW510wHrLje2UPc/9VzBSTMjgqN YDIBVZ6Ib5UNTCKH2uyOrknSZjxAZaXvfuNbBjeOT6IVikp8vOzRRASycVmbNVWGoiiW 1LLISuXPvD/ibXvWQIHJBdfrL+PQW2F7BV8/u0BH2iwJ1uKBKSLHNJK0hiWKx0bBAfly uzZg== X-Gm-Message-State: AOJu0Yw3+YibKYp32fjewUpQd39S9kKJuVpdziodcOIMIMVfwkKGPd7k N+o1zJChFcBRz9jClzSKy4TiTcUxzgn3MNjTIYt/pqCx6NaocbHanfYHlIwPZsndwt9qIw3iS2Y CqdP5pE+eY2bqJtG9I6jFd3tB7q397TGKk2r/XgbFVgYSR6uNM5lGKieOtyfc6qFXkzLI3kNFez 6xTxi2BQ== X-Received: by 2002:a17:906:8a53:b0:989:450:e565 with SMTP id gx19-20020a1709068a5300b009890450e565mr13318ejc.23.1692201318750; Wed, 16 Aug 2023 08:55:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFslXW9dL9FpU499cyD6kbcSREJ/ENi+bbEoqcZJBultUUbgbN4mVOSaxFzLQ5oW5QPlsoTlg== X-Received: by 2002:a17:906:8a53:b0:989:450:e565 with SMTP id gx19-20020a1709068a5300b009890450e565mr13310ejc.23.1692201318547; Wed, 16 Aug 2023 08:55:18 -0700 (PDT) Received: from localhost ([31.111.84.232]) by smtp.gmail.com with ESMTPSA id rp9-20020a170906d96900b0099cadcf13cesm8618698ejb.66.2023.08.16.08.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 08:55:18 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 06/10] gdb: make use of is_target_filename Date: Wed, 16 Aug 2023 16:55:02 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: Spotted a place where is_target_filename could be used, except that is_target_filename takes 'const char *' and in the location I spotted we have a std::string. So I've added an overload for is_target_filename that takes a std::string. There should be no user visible change after this commit. --- gdb/build-id.c | 2 +- gdb/gdb_bfd.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gdb/build-id.c b/gdb/build-id.c index f68384f0197..6abf04ffacd 100644 --- a/gdb/build-id.c +++ b/gdb/build-id.c @@ -90,7 +90,7 @@ build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len, /* lrealpath() is expensive even for the usually non-existent files. */ gdb::unique_xmalloc_ptr filename_holder; const char *filename = nullptr; - if (startswith (link, TARGET_SYSROOT_PREFIX)) + if (is_target_filename (link)) filename = link.c_str (); else if (access (link.c_str (), F_OK) == 0) { diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index d15b1106d9a..5e9468dcdfd 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -44,6 +44,14 @@ struct registry_accessor int is_target_filename (const char *name); +/* Like the above, but for std::string. */ + +static inline int +is_target_filename (const std::string &name) +{ + return is_target_filename (name.c_str ()); +} + /* Returns nonzero if the filename associated with ABFD starts with TARGET_SYSROOT_PREFIX, zero otherwise. */ -- 2.25.4