From patchwork Mon Sep 18 14:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76295 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CB4E8385559F for ; Mon, 18 Sep 2023 14:53:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB4E8385559F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048832; bh=QbuCWHCxyi7E2pgXGnbIb4qUk/s3ToN23mJhwAMfW1w=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ovAL+Ss/fl3WZhajbG4hGHurYD83AIx/+xQlznbn6eoOAPMb9PW2pdaXlqwtBG8aV SN07FlCXgkzuu704NlfatB8MScYZ89Tn5Tl2CNXAqMC6+7PcwC6rpFIKdE+q5q/xn3 dt0UTmIfiOSH+YD/h6NO12M6T1vwHRqAQEJqbJJg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by sourceware.org (Postfix) with ESMTPS id A9F95385772F for ; Mon, 18 Sep 2023 14:52:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A9F95385772F Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-79ac0d271b4so118570539f.1 for ; Mon, 18 Sep 2023 07:52:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048772; x=1695653572; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QbuCWHCxyi7E2pgXGnbIb4qUk/s3ToN23mJhwAMfW1w=; b=te4B5QCwWbdUoaU9DHyRh+hiIpJk5b8x1o77Ml2dnBwAWp/86r74khk/czTCl4/ciz FL3mTHnsPXYpkpd5mjsYFp73rH4u5RqCaV1VU6szCt4/UaIwAxI4q/mWoaUSTtc6wn8G p/jlRJmT0bur/cQmtm4F6A5VUH4dS3yVfr9DaysGz0tHBStD420FeDNHwSErnt3/f67B rCYoJFiqxxWppa9HEXf0xHcK5a1BByDdar56EhfZ4DEXmo4tecyFNb+7BJt1YeNOO6Fr 8vceypBr0oPP9SeWuH+PsxFQv9fdquIBz/9uhLbmLZ0z9HXdxxJ3NwzHGTUVlUtiUPE7 JimA== X-Gm-Message-State: AOJu0YxBNhqi7T/AEEj1AwQi5OjbjXObj26Q9RVgcBdvZbWhb19lkkD/ Xm7C9CftPSHNpbezfcXGcPFDeIqQvUEsbzFsOl1tag== X-Google-Smtp-Source: AGHT+IGeE6S4JPsRAvGxYRLDpm3c+3+6uUikMf1a4aowFSSIHsRFOkt8+Y7vFTvw5jSYmYZ5WNljEQ== X-Received: by 2002:a05:6e02:c74:b0:34b:ba9b:c764 with SMTP id f20-20020a056e020c7400b0034bba9bc764mr9745224ilj.18.1695048771957; Mon, 18 Sep 2023 07:52:51 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:51 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:52 -0600 Subject: [PATCH v2 7/7] Remove old gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-7-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This removes the old gdb_bfd_openr_iovec entirely. I think any new code should use the type-safe approach. --- gdb/gdb_bfd.c | 25 ------------------------- gdb/gdb_bfd.h | 18 ------------------ 2 files changed, 43 deletions(-) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 2f489a4f210..217753cf914 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -931,31 +931,6 @@ gdb_bfd_openr_iovec (const char *filename, const char *target, /* See gdb_bfd.h. */ -gdb_bfd_ref_ptr -gdb_bfd_openr_iovec (const char *filename, const char *target, - void *(*open_func) (struct bfd *nbfd, - void *open_closure), - void *open_closure, - file_ptr (*pread_func) (struct bfd *nbfd, - void *stream, - void *buf, - file_ptr nbytes, - file_ptr offset), - int (*close_func) (struct bfd *nbfd, - void *stream), - int (*stat_func) (struct bfd *abfd, - void *stream, - struct stat *sb)) -{ - bfd *result = bfd_openr_iovec (filename, target, - open_func, open_closure, - pread_func, close_func, stat_func); - - return gdb_bfd_ref_ptr::new_reference (result); -} - -/* See gdb_bfd.h. */ - void gdb_bfd_mark_parent (bfd *child, bfd *parent) { diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index ae374f5d7ae..604365b61b1 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -181,24 +181,6 @@ using gdb_iovec_opener_ftype gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target, gdb_iovec_opener_ftype open_fn); -/* A wrapper for bfd_openr_iovec that initializes the gdb-specific - reference count. */ - -gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target, - void *(*open_func) (struct bfd *nbfd, - void *open_closure), - void *open_closure, - file_ptr (*pread_func) (struct bfd *nbfd, - void *stream, - void *buf, - file_ptr nbytes, - file_ptr offset), - int (*close_func) (struct bfd *nbfd, - void *stream), - int (*stat_func) (struct bfd *abfd, - void *stream, - struct stat *sb)); - /* A wrapper for bfd_openr_next_archived_file that initializes the gdb-specific reference count. */