From patchwork Thu Nov 18 23:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guillermo E. Martinez" X-Patchwork-Id: 47911 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 C60953857C43 for ; Thu, 18 Nov 2021 23:24:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C60953857C43 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637277850; bh=i7TircmPgLVgow6aDBRqSG0oA9jIxzAR8hDUbByoGzg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:From; b=SxBueN1Hkb66nZQXbc/HV7mfNizLAda8M5Zn0qa1x9qo2WxlS4GqBOyNpSG/FdZFz acKCDJxF9DxRHHaZXaCRY8RK7L4+R0+crfmqwf+fYGFDA3mQ0cwlaY+IuhKnWLoev6 I1u1V01/CznunYYluLbjIF//IUghiqLw56aYdRjU= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id E53CC385800F for ; Thu, 18 Nov 2021 23:24:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E53CC385800F Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1AIMDE8x025634 for ; Thu, 18 Nov 2021 23:24:01 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3cd1w8bh8n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Nov 2021 23:24:00 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1AINKX7m184319 for ; Thu, 18 Nov 2021 23:23:59 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2170.outbound.protection.outlook.com [104.47.73.170]) by aserp3030.oracle.com with ESMTP id 3ccccsjghg-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Nov 2021 23:23:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZSljTc7hDSedTcruKXR0msADNeTS0fvkRUKmWuPumtwfyvGsQqhGFCR6vMXIPdQw0l82R2jtPAD7S4J99vl2QY0pKFvdiCrPinfHxm5UKSF9WevdtIGJOjadYQzR5CYIXlUeoFhcFWXb1r6AqlJ4Pq9IUSZ0GswdRza/goO2dAFek6aRV0obUBGYtr+1h9E4yPWvk+C4PKrFOKdMSBezVo9esr5VWH1VLFBPf0TzYNBCUkWOo34yW9fnMlOqKBjHNl8TvX7Vr/qirCBv2Xrp6YSI+1S+6lBUul1neKdTaVp8biWE33eL3hQMo0LD1xOsG7eSjPslxZnokc5s+HGgrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=i7TircmPgLVgow6aDBRqSG0oA9jIxzAR8hDUbByoGzg=; b=dpDNc8jGEKCdXL0L1RYZsxDmzYpPPNpCpmvTZh+5ugqJWBQCJTs9/QIkBnZkPd60e8J0NOsQkkTm35PLQatE8ACgAu1NsXjKTWNnC54F0nFXMOv9sPZoXGIeCoQBAK/q3poxhMWo092klxTJso4zcDeVo3qnM3JZMuKN9W9DT5AzSGru7oxeD/EU0eUJBLG7yiiFcIbLkYtp2NPSOBWGnRnVTmxotBBHJawu1iGiARxLg3TbkdSGWyRuTlj0Cc/KCNB4+wR/++jn209x1DxuIT2zuTPF0x3j8YhIvx3wSGP5V4GBWlNtjl26e5OLQm2v9XmaRn7/ZyhjzNvud2HnDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from BL0PR10MB2852.namprd10.prod.outlook.com (2603:10b6:208:76::22) by MN2PR10MB4045.namprd10.prod.outlook.com (2603:10b6:208:1b7::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.27; Thu, 18 Nov 2021 23:23:58 +0000 Received: from BL0PR10MB2852.namprd10.prod.outlook.com ([fe80::7126:e98e:9cff:8765]) by BL0PR10MB2852.namprd10.prod.outlook.com ([fe80::7126:e98e:9cff:8765%7]) with mapi id 15.20.4713.021; Thu, 18 Nov 2021 23:23:58 +0000 To: libabigail@sourceware.org Subject: [PATCH 3/3] ctf-reader: Use ABG_ASSERT instead of assert Date: Thu, 18 Nov 2021 17:23:30 -0600 Message-Id: <20211118232330.16310-4-guillermo.e.martinez@oracle.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211118232330.16310-1-guillermo.e.martinez@oracle.com> References: <20211118025606.554809-1-guillermo.e.martinez@oracle.com> <20211118232330.16310-1-guillermo.e.martinez@oracle.com> X-ClientProxiedBy: SA0PR11CA0189.namprd11.prod.outlook.com (2603:10b6:806:1bc::14) To BL0PR10MB2852.namprd10.prod.outlook.com (2603:10b6:208:76::22) MIME-Version: 1.0 Received: from sali.us.oracle.com (2606:b400:8004:44::1a) by SA0PR11CA0189.namprd11.prod.outlook.com (2603:10b6:806:1bc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 18 Nov 2021 23:23:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ee9a973-7415-4374-2943-08d9aaea7ef0 X-MS-TrafficTypeDiagnostic: MN2PR10MB4045: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:68; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A2gNDnT//p61Cw1LL118bgLXQ+01uZiIpHG/dqeJRRJgrq19vITGq/60BLo82XG3TgBB4lShFkLnpSWAKgtGaB7rVkhKc9uhx53SxiqFR8AN1E+CcL/rQwfqkWjbQihTTeNpYghORssLBQ3dzxa2l4/TZtN8J+Y44LySDmYpZpcYZqD/II1wetToEh761J7aFTwvqoFsBDOBv3okEJPcaNPfzjM5SevG2AkkaYrGFIGPFh3o97pBmPQwDjDMzeW4gDfxaaJzWya/W0TbxwYJjWz4iiTEQqtbIMjStqen3DXbv8VazBjgaT6cDt928ugrrs0UqAHXmaPmkp4xmVQ5bxpWWiVsVQ26ap3aA3gw19Na+V8QS9GeY8RipOHHtGF9dkoj62BDL3MnkCAGQIasFU9sznnddoS/dIfLFyIgTJgXx8rB4imLyYgsygX6s35Oc/kLUI13Te0tHEdzby1fw+UWrnQqED08kS33IKhuoavcitWMwoW36ZgxxaRpp4Gy0V3Sm8XMwsljIXnYx2KNpBFPd6fz9VBGnFdEKPwo7MOhQbV0eNEAo4gZdozmcNB8MU1cf4+SgJ27T9XjrmgM2ax/AOjoKd1gpwERDblieySzO30JXk22u3WO/A1E9Rd5t2NIW5QlSBPoesUQAHz5zA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR10MB2852.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(6666004)(6486002)(36756003)(107886003)(38100700002)(83380400001)(86362001)(5660300002)(52116002)(8936002)(8676002)(7696005)(2906002)(6916009)(508600001)(103116003)(66556008)(66946007)(316002)(66476007)(4326008)(2616005)(186003)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RI0fJXCVWZt3A2jC5Bu4tuFgcoIqW6Fb3FO7gVt4iEy7fNVQQN/l6R1ph5s4RaoP6cCmj2v2DCmp2SqfGVeKeBxP2UMsF3hFwk4K2LEhP7DbkTc37zAJtZB8KJ5Tc0HeAj7Zqv2YHPeWSuhlNCEsFRY4NDybHOJVVcsDcB0csQiEfiJy79oh3orToh2N1EvKRva4BtiHhDzUte1I3GajxTdBc3BUzFroM9Yxxc3s5Tnz9FA3s2/JgPCqXuFNafIyiPFrqsNDe4Gg57j6JANH+N/tGB/7e/Rzuzn1YkrqLv75jry19RPxSBDm7r/0i1DuYPW0t6lkUbuw9QXcuApNj8nr3YBKECBqk/QhgOhBXZX62mb/p8z/7KDtD0rMBQ9N769CAqTQJ92BLZxDtl/smVsNtsVBHtQCTLrf0z91kNJKK6ZhP8zPLwtG/gsWHrz16xOeccWFeEugoUq5JVRqJh0/vUlQa51MyDwq2B5yRLtviHLZk8oIfbS3Sk6hNAdoDrAJwsHs04pR+NgXZbwL9vINSPwBKrBP2aO3ZfGZJ80JrBk1taqveb4htGykQQJKzjGYKLP1wy6eoqUkcD+66U7/NlVD5O6azuMkiBNlg6naaOrsJ7lK26fawlQKjkxsudNV8Ogruwd85kDhmixIbj+x/KoaBfrEPDi3veOiZwVXcVjRwglCum44lswzXW3MaKr3TseDfjI4WGRFCui29ldvyW3m2EtzGYcg99dE69XuVO2D3UdIPWk8kfn91dT1tbP68/yYn0CDpYfnmtp5ZpzbR90MMEAXBinm0XhytdRdHBTpTjaMDJBkCy+/PHxNY5F9vO+tbJCDEf+VK36z6SJRbtc1wZ1voOX6CSRSIK1qEaUvel++OCM5+hnZkuQK6R/gFpT14NyZ3CuzuI8Hpjc1OQ3RtqTyfP08ub/1HeqIRsBCd19xQLRHq0MAsYJA0s6/pYOjv0XaD+N8x34gjUP4iKBbtVgFB2dL9gPWi73wSvVPpivAc8LUdAY87gbG6xt4N8OyU4E/OF+h74zoLIBPNuOM0nAO8QKOGPiaugTwEHu9LmmtNR9d+N+eU/1xPST4V5CXJjQegT9YiJT462szhdTaOWajgeL8Jrn+n9tKUsv8Pb66MuEfqsOv9NiWqXVq+ymmZIpiI0dVYl0a+0fc/BCluxqAv9NoF3ytk1WA6X+uofbE66vecfueaEbG85QqQsSlMVtKBaISFlPSM7UPFASjfwvvRpEqMIUI7EeO3ORS6CPyLljAEOHperW4z5EHqEnVBLiWTkPBVv9seOGw8b3eOuw52HiV6R+L1zp424d1GlNyBq5+WRxcEnbvc8AAXjuJZ0c9DjcF/Cg3XoRfnv3MOPA2fKXF7eNEXkIN1xfGELl9qWt7YRa81aMZVOmbknqHM9GxyKE/hwnisUrewWW4xSt5fx6ox1UEDCA1ueOGYz5/gLzoIGw3fr6u0ImTQ/csjdlLRa4nnwE0GmQFNIkkt++5bKqju30hOYwZS6iTvAGSx9HJgThqF0tcYC+7cSk3YHgchYH+VoCWosnEkym9UKg198iWudU5WFxigophmGFTEp7ah4gbEaeavGC1FZjz1xZEzANF6Q+6Uv5asdCtznBxW9njZn/lC67RJNDbCk9ETR2xU0h+ItxVCZwPx0Z9LsCrfsebOh3NNKwPr3i2DgNGixUJOflgi1A= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ee9a973-7415-4374-2943-08d9aaea7ef0 X-MS-Exchange-CrossTenant-AuthSource: BL0PR10MB2852.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 23:23:58.0552 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DKH80QcsnHDO0EKthL1ULHw0OxbnXaNASv8EvLXUrwS/tmY9qWqwcd/fhk0CTP/izSUnhFhbmikspvsnh8vCX74s8ifRQ5N6oULHA61P1vY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4045 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10172 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0 adultscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111180120 X-Proofpoint-GUID: mJVpy8KYKlz_5nJqxGNzCWu0C37LyhoL X-Proofpoint-ORIG-GUID: mJVpy8KYKlz_5nJqxGNzCWu0C37LyhoL X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: "Guillermo E. Martinez via Libabigail" From: "Guillermo E. Martinez" Reply-To: "Guillermo E. Martinez" Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" * tools/abidiff.cc (main): Use ABG_ASSERT instead of assert. * tools/abilint.cc: Likewise. Signed-off-by: Guillermo E. Martinez --- tools/abidiff.cc | 10 ++++------ tools/abilint.cc | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/abidiff.cc b/tools/abidiff.cc index 30959616..779fa18b 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -1172,8 +1172,7 @@ main(int argc, char* argv[]) abigail::ctf_reader::read_context_sptr ctxt = abigail::ctf_reader::create_read_context(opts.file1, env.get()); - - assert (ctxt); + ABG_ASSERT(ctxt); c1 = abigail::ctf_reader::read_corpus(ctxt.get(), c1_status); } @@ -1256,10 +1255,9 @@ main(int argc, char* argv[]) abigail::ctf_reader::read_context_sptr ctxt = abigail::ctf_reader::create_read_context(opts.file2, env.get()); - - assert (ctxt); - c2 = abigail::ctf_reader::read_corpus (ctxt.get(), - c2_status); + ABG_ASSERT(ctxt); + c2 = abigail::ctf_reader::read_corpus(ctxt.get(), + c2_status); } else #endif diff --git a/tools/abilint.cc b/tools/abilint.cc index 2e9bae49..efddd77b 100644 --- a/tools/abilint.cc +++ b/tools/abilint.cc @@ -373,9 +373,8 @@ main(int argc, char* argv[]) abigail::ctf_reader::read_context_sptr ctxt = abigail::ctf_reader::create_read_context(opts.file_path, env.get()); - - assert (ctxt); - corp = abigail::ctf_reader::read_corpus (ctxt.get(), s); + ABG_ASSERT(ctxt); + corp = abigail::ctf_reader::read_corpus(ctxt.get(), s); } else #endif