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.129.124]) by sourceware.org (Postfix) with ESMTPS id 8C8783857BB2 for ; Fri, 25 Aug 2023 15:35:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C8783857BB2 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=1692977700; 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=LpwALr8yR+QlgCFUUVjsdqQHKkyErfi8VSpvEgqvtog=; b=XHZqc2B12a8YPvUTgivM7SVupzPQxhWU2++uONVCc5stGrHDFkLN8K2Gyc25OPemTUwYuv Lu3FuwFbKlT0mYy5/2jdc+/UYEH7g6/skYbIU+pWUQqFJUupBD8OuGlCPXiAjaUtLetm9t uZuR1dbsGpHKjWc9iht6L0aomy6ypKg= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-691-MUoWif3HPi6Ssa6ikEoYqw-1; Fri, 25 Aug 2023 11:34:59 -0400 X-MC-Unique: MUoWif3HPi6Ssa6ikEoYqw-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2b8405aace3so11664981fa.3 for ; Fri, 25 Aug 2023 08:34:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692977697; x=1693582497; 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=LpwALr8yR+QlgCFUUVjsdqQHKkyErfi8VSpvEgqvtog=; b=hS/A6gHO2EnE8UKf0zJjKnFR+Rphg+gzb80uitLLy+gjzj01O8Z0DIcECNUWb77V+Q ohKYbjf4byjwJa2tmm/pWu5ZlZVCpI+1ypauyfFoLccQRURWjJ+betcKecOY1AoDHKSi zLqzV4LMqn8+uvcBiqfEK2brkmntDXoQQ16I8FsS4EG4NYntSBBM5WyF9cIMFvQjo8iz afotrm98H/DEGbIlGIV09Qqmtbsr3mudkka8Ol2o8RILZNo7887jjKdwhgrs3t26Dw8C sS3k/B0ZGxzPddRVc8ahK+h0yONsHywx48NxrfAwxhBD3lMEbnyp7/gYqk6Iz02UtK1L ppYQ== X-Gm-Message-State: AOJu0Yz3t8YNFaEqqRhXsyIh3S8tqsD07jsZZWRCYPv7lPJmihB4dDbh FHzilMxlqfYLULKj/M+/lDY6Wc26Bo8xko2gv3l4SNrW7rw6mhoEfbsNuFL5MGD+NqGdvaTxw9v x2vAZMDBDat6Nmx5otdy9ZKgrqdU8ouu26fpqPQc8WczY+lXMoRsI+rR23PDUCEhBw8Nfp94Fa2 RgBOLKJQ== X-Received: by 2002:a2e:720e:0:b0:2bb:b56b:f67e with SMTP id n14-20020a2e720e000000b002bbb56bf67emr11756297ljc.19.1692977697463; Fri, 25 Aug 2023 08:34:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHow4Q6g9etYmLxLROpElkwIIF/T8qtXJVI3tinFkfunGxknbgLDk6W/bDc2YBtKVc7oCC7tQ== X-Received: by 2002:a2e:720e:0:b0:2bb:b56b:f67e with SMTP id n14-20020a2e720e000000b002bbb56bf67emr11756284ljc.19.1692977697053; Fri, 25 Aug 2023 08:34:57 -0700 (PDT) Received: from localhost ([31.111.84.232]) by smtp.gmail.com with ESMTPSA id e8-20020a5d5948000000b003143add4396sm2527026wri.22.2023.08.25.08.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 08:34:56 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Mark Wielaard Subject: [PATCHv2 06/10] gdb: make use of is_target_filename Date: Fri, 25 Aug 2023 16:34:39 +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. Reviewed-By: Mark Wielaard --- 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