From patchwork Fri Jun 3 13:16:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Woodard X-Patchwork-Id: 54779 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 BC06038207E1 for ; Fri, 3 Jun 2022 13:16:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC06038207E1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654262194; bh=4An1vKmHkjkvursdcN5xB84VQouBFPvZYHXdHo6yZDg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=YjVW5vkSjWHQ96z4CH2vkTWkg7mb5KfeoRJeoDNS2HDcNhP0SjauZ+vxb9iHkfTe4 aiAZ1HB1Bq3J0AlNXIgPyWDZvHuDXD+7H1j4iov2ctcJACeGetYwEtDREfpqkPQBdu e7PxRrfYPon4e2Z/2VFIib+hizwHgiwsoZqYc8R8= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DFF6E385702E for ; Fri, 3 Jun 2022 13:16:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFF6E385702E Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-182-4xa9197sMqu2S2evY5eK3g-1; Fri, 03 Jun 2022 09:16:28 -0400 X-MC-Unique: 4xa9197sMqu2S2evY5eK3g-1 Received: by mail-pj1-f71.google.com with SMTP id lw3-20020a17090b180300b001e31fad7d5aso7271756pjb.6 for ; Fri, 03 Jun 2022 06:16:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4An1vKmHkjkvursdcN5xB84VQouBFPvZYHXdHo6yZDg=; b=S3kg7IqVwwWoiDXhFQlnnCO00Jq2S9n0U6QzOkC9MnHoS7pAekVGZIof4xwcWqqXHh oPKgGliPvByTZKDn4c1ESDu0zL9Y7YoPErwyZzXyCIqvPDBeGt0Q2UfrJH39Lf3mUPFS Qw1AlqjurMV8BQL37GF9Lygw8CUzRCFfGnr3Lz9QXmmAVWdDRY4NUR5ATuJEq5fXVi8T 6t0PKlAlW7jdgBQXOeLCDMJUqS156zRgK83Q4UIA8jCryYx1YHhTcvIS5h3uZ186KFJO sIKI3BRvhtMMPD/LBPKB6v1cLpMoHE7Soe1CJgBLGYTojPOSdn/qifEds2UQRlfikNA2 UF+w== X-Gm-Message-State: AOAM5321jysTAh5+j5JmIhGdfmyqeQz/hOthUHUul7vQH/1NwaXN9ZTG vKqYsbXLpchLes+jY3q+B7FP7vhLj+52dozbiGgkditBE/HGa0RkuylhD7yCAi5KOBanHoZtT5q z0s5mfSeZUlNoyLPySi7gZOCJi0NuhqIoxaRasKlsLtfRLidZc4TnL6JW8kQqcB44a0vQeqI= X-Received: by 2002:a63:90ca:0:b0:3fc:8c61:c83d with SMTP id a193-20020a6390ca000000b003fc8c61c83dmr8610201pge.203.1654262187392; Fri, 03 Jun 2022 06:16:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9qzhIF+ij3w1ifz+EMSvjlvAoSD+sAJMDL4TwOTBig3y38fNLZ9yi7iziCw++/G5X8WyxVg== X-Received: by 2002:a63:90ca:0:b0:3fc:8c61:c83d with SMTP id a193-20020a6390ca000000b003fc8c61c83dmr8610170pge.203.1654262186893; Fri, 03 Jun 2022 06:16:26 -0700 (PDT) Received: from alien.localdomain ([47.208.199.57]) by smtp.gmail.com with ESMTPSA id b6-20020a170902650600b0015f2b3bc97asm5465214plk.13.2022.06.03.06.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 06:16:26 -0700 (PDT) To: libabigail@sourceware.org Subject: [PATCH] Remove redundant code from abidiff Date: Fri, 3 Jun 2022 06:16:21 -0700 Message-Id: <20220603131621.315455-1-woodard@redhat.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: 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+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" While working on abicompat, I noticed that the following two blocks of code are redundant. They perform the same test as in the switch statement a few lines below. * tools/abidiff.cc - remove redundant code. Signed-off-by: Ben Woodard Signed-off-by: Ben Woodard Signed-off-by: Dodji Seketeli --- tools/abidiff.cc | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tools/abidiff.cc b/tools/abidiff.cc index 37a273ad..e0f6d5be 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -1127,20 +1127,7 @@ main(int argc, char* argv[]) abigail::tools_utils::file_type t1_type, t2_type; t1_type = guess_file_type(opts.file1); - if (t1_type == abigail::tools_utils::FILE_TYPE_UNKNOWN) - { - emit_prefix(argv[0], cerr) - << "Unknown content type for file " << opts.file1 << "\n"; - return abigail::tools_utils::ABIDIFF_ERROR; - } - t2_type = guess_file_type(opts.file2); - if (t2_type == abigail::tools_utils::FILE_TYPE_UNKNOWN) - { - emit_prefix(argv[0], cerr) - << "Unknown content type for file " << opts.file2 << "\n"; - return abigail::tools_utils::ABIDIFF_ERROR; - } environment_sptr env(new environment); #ifdef WITH_DEBUG_SELF_COMPARISON