From patchwork Tue Mar 2 22:11:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Woodard X-Patchwork-Id: 42205 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 164E2395187A; Tue, 2 Mar 2021 22:11:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 164E2395187A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614723084; bh=FPDi+n4FoGMRYRsxCsSXIOttR/mZbDbtz0TDsOSvNnQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=jfHPE3C5Zx1snXTH/vcabqmBsny2JFgmoa+zNq6qGoB/byzIdRfr+KxiXUmqn2XB/ fO7evBgH1hn5z3C8Exg/lxyxzmtB9dEIZlEoxeMBhTMu2doJaoDNVUtGrHtsa2PdZl ztYRIhbV6K1sDpaaUgAOUDuQ4hrIbpksXHAxDA9g= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id E97C7395187A for ; Tue, 2 Mar 2021 22:11:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E97C7395187A Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-514-p14qnUyFPP-o5BzJFMyRlg-1; Tue, 02 Mar 2021 17:11:20 -0500 X-MC-Unique: p14qnUyFPP-o5BzJFMyRlg-1 Received: by mail-pg1-f198.google.com with SMTP id n2so12700426pgj.12 for ; Tue, 02 Mar 2021 14:11:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FPDi+n4FoGMRYRsxCsSXIOttR/mZbDbtz0TDsOSvNnQ=; b=ppzI7a/IrooMul/p7d5F/FM5A09HdPc3OEeWR/sVbqZLd1yHQ+1Nf3iAYlYqqg1M3R OOEi1VK7RA5IwT5C/O2wGeEI6jKitgcNX44o644SE0OqIErhfES2me/5612SVl1HMU6c sNYsiYnExFRlvCQYcXidI0UMMiPKX6fz8vRECO3LY3xXcGfCgNdCt8xyerHsTQ1ObGWc OMcMWM3WMKCQkH5AG+xhKFZOxLwJ/a3PmkJzi5UEJIOPKL9aPO7EQ+9y1U0GcUjOnRoz v3/JZZYJLUcXeh8WCPU7evUgCz2QOb4w643ZqJP0czfex4FIPcgIl6tigggud3u8Rh6u 3x6g== X-Gm-Message-State: AOAM532c/zPEfHlAp6155oLBqdZCqWWiIplItSWO0SCt5vjUUZkhH0i2 DtnwtSG5XxhcK+teAD/CKdJi44t6PBDLxcKuo+TItC8ygKg5S5d1FsidPk+6cb6DCcxHDzC44W1 geR5FiSw5xTKDTVTSW4QGBeiY2pALZi6HP1hCNpDDsZq9yg/QXxMCoy6blh+KqPdhiGHEekw= X-Received: by 2002:a62:5ec1:0:b029:1ee:7baf:8ed3 with SMTP id s184-20020a625ec10000b02901ee7baf8ed3mr5102282pfb.62.1614723078721; Tue, 02 Mar 2021 14:11:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLzhPHaxVG/hXgAqwR5lwrxRx7Iq/ky8LeiFbx1ssYHhfOttGfbV6Uj3vrB6+u+RpGGiPOMQ== X-Received: by 2002:a62:5ec1:0:b029:1ee:7baf:8ed3 with SMTP id s184-20020a625ec10000b02901ee7baf8ed3mr5102250pfb.62.1614723078242; Tue, 02 Mar 2021 14:11:18 -0800 (PST) Received: from alien.localdomain (47-208-193-143.trckcmtc01.res.dyn.suddenlink.net. [47.208.193.143]) by smtp.gmail.com with ESMTPSA id c12sm4252988pjq.48.2021.03.02.14.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 14:11:17 -0800 (PST) To: libabigail@sourceware.org Subject: [PATCH] Fix declaratons of conditionally defined functions Date: Tue, 2 Mar 2021 14:11:12 -0800 Message-Id: <20210302221112.30655-1-woodard@redhat.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ben Woodard via Libabigail From: Ben Woodard Reply-To: Ben Woodard Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" Functions relating to zip archives are declared but are never compiled when --enable-zip-archive=no, the default. This makes sure that they are not declared when they won't be defined due to conditional compilation. Signed-off-by: Ben Woodard --- include/abg-reader.h | 4 +++- tools/abilint.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/abg-reader.h b/include/abg-reader.h index 70851c86..f1408912 100644 --- a/include/abg-reader.h +++ b/include/abg-reader.h @@ -52,7 +52,8 @@ create_native_xml_read_context(std::istream* in, environment* env); const string& read_context_get_path(const read_context&); -abigail::corpus_sptr +#ifdef WITH_ZIP_ARCHIVE +corpus_sptr read_corpus_from_file(const string& path); int @@ -61,6 +62,7 @@ read_corpus_from_file(corpus_sptr& corp, int read_corpus_from_file(corpus_sptr& corp); +#endif //WITH_ZIP_ARCHIVE corpus_sptr read_corpus_from_native_xml(std::istream* in, diff --git a/tools/abilint.cc b/tools/abilint.cc index aaf500f7..fb7b0781 100644 --- a/tools/abilint.cc +++ b/tools/abilint.cc @@ -48,7 +48,6 @@ using abigail::corpus; using abigail::corpus_sptr; using abigail::xml_reader::read_translation_unit_from_file; using abigail::xml_reader::read_translation_unit_from_istream; -using abigail::xml_reader::read_corpus_from_file; using abigail::xml_reader::read_corpus_from_native_xml; using abigail::xml_reader::read_corpus_from_native_xml_file; using abigail::xml_reader::read_corpus_group_from_input; @@ -58,6 +57,9 @@ using abigail::xml_writer::write_context_sptr; using abigail::xml_writer::create_write_context; using abigail::xml_writer::write_corpus; using abigail::xml_writer::write_corpus_to_archive; +#ifdef WITH_ZIP_ARCHIVE +using abigail::xml_reader::read_corpus_from_file; +#endif struct options {