From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id 1A6BE385770F for ; Thu, 24 Aug 2023 17:12:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A6BE385770F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-34bbc5eb310so159615ab.2 for ; Thu, 24 Aug 2023 10:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1692897145; x=1693501945; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qaApb883NwlAiVaYEDCouX6J0DWPKkpO1EFruzQ4k3E=; b=ItMjvLeeTk4n1czThdhq/4/jZtdYs/wk2M11D7QZegv1Dk9AxNPYPnrmjhBCmQ6fKG gSWPtrB+swAw7/5rpgg0dEqI85BzTraLPz0FnB0S/Bai/eUOjeXM93Zi48iokEU+1HZU b1WADpsfMnULy2oO9rSYVCr8HolmQN2x9SHeuz6IQ9JWVGwWW/AekQBHHZEnKNQWZMB6 +IK6ggAaObBkyjpdksAhaD3O+0kUIzF3e6PtcdYWw/9RFz8Rgy2ecy+/bTqDXI3UP4VI VSaezsyqgdyeWmxxXhPSaYe5kbQc7ikIit9KU90t8V6rjxUSxabo9EvyIPJwJjzuBtGu d+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692897145; x=1693501945; 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=qaApb883NwlAiVaYEDCouX6J0DWPKkpO1EFruzQ4k3E=; b=bJ2EuBuIJ8YdaptQmDCSJ3VY9FSaV/HAO8vg9KQbaJD7JywFSvIRjVHjO12dUqWzFs n6+gXp2kURJesLoOs07cXNNdRDq25U4kiCK9oUw7BA2YU27B4y+TVDs5UksNVmSFw3NW vcEBctcfruIwdq1uN+RXPNw34KuCbe2CdiBrKieZdixS5F+fDte7zq85+8F/bennRIWs +lJy0DsVcr9OLbq7alDQ+tZGg3qQKoITJmia3+iwPziTNH4v90x3nNnOTOYlbAF3xepr EsGy6Np7XaWFscxauC67wBxTOXLlS4/w9Bxt4eMKxD9Miz9EIlpxOD73YopL6JO0AktM W8QA== X-Gm-Message-State: AOJu0Yy4sKctv8Oefc4t3gBwFF1FpK+lnzqDN0nKJwJQW/oSXaMa+ArT OcEMyt7ygUUT6T+G+CnrGd5VMzu8k7Yye25184V5LA== X-Google-Smtp-Source: AGHT+IF3Z2gHV3uReGetLmmfV69RFC0qgrVSW35wt1/UOkBhJpahxlkk096JQ25C3l6tJ2k4PllhwA== X-Received: by 2002:a92:ce0f:0:b0:349:7663:566c with SMTP id b15-20020a92ce0f000000b003497663566cmr5724616ilo.30.1692897145368; Thu, 24 Aug 2023 10:12:25 -0700 (PDT) Received: from localhost.localdomain (75-166-142-177.hlrn.qwest.net. [75.166.142.177]) by smtp.gmail.com with ESMTPSA id n8-20020a92d9c8000000b0034986f6d9a9sm4722515ilq.78.2023.08.24.10.12.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 10:12:25 -0700 (PDT) From: Tom Tromey Date: Thu, 24 Aug 2023 11:12:24 -0600 Subject: [PATCH 7/7] Remove old gdb_bfd_openr_iovec MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230824-gdb-bfd-vec-v1-7-850e4e907ed1@adacore.com> References: <20230824-gdb-bfd-vec-v1-0-850e4e907ed1@adacore.com> In-Reply-To: <20230824-gdb-bfd-vec-v1-0-850e4e907ed1@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 List-Id: 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 c635ba007d0..7741fc98e97 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. */ -- 2.40.1