From patchwork Wed Jun 19 13:59:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Alcock X-Patchwork-Id: 92444 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 737303888C5F for ; Wed, 19 Jun 2024 14:00:22 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 64451388456D for ; Wed, 19 Jun 2024 13:59:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 64451388456D Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 64451388456D Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1718805589; cv=pass; b=dbe8rI+HGsyo6SmSeOKeMZGniDDBob1Z17xigBWanwPHz/4kq5NH5rVTaVBXT+IhBOk7SqK+10u3BIXhTKzJJyWq0b5Qi7xzYg4fJRfSELjH5ETSHJew5hyle6hXvWNXVX7Ag4A81CqvQtW9QsQNI8EpIiJuDyFIaEf8lZbwEKU= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1718805589; c=relaxed/simple; bh=J+mgtHlX2j5bHzQK72UWxh2MN6QBvmDxAiEABmgbBHA=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=jIjKjuHxecA3BhxbN6vboMYFQNwNsWnD0kR+KI/FcCvAN1WlInxDlCoTwTmNmuD38iTnf3dwO2e2diPeOrAFA3SDjIdULag03axhHztEEcAvizJ1yrFsixxb1SzxACqd5T5F3YxkiyWI6VKJ1ayHZNdgiyOXhlWQp4faV7OXjpg= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45JDCMRl005060 for ; Wed, 19 Jun 2024 13:59:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=corp-2023-11-20; bh=w01Gf4+7nlsMK4 jVu44NjAsZUCQF1gAwLPV3Atw6EIY=; b=Hlk6rgwH2KqLHmlHbCnnYHdox7FWwO YVSpWUvJBtaYu+VnUj7QeddMx3wZUAe4pq4XPQUwOlMSYNAjbABOgBgbnYBZCOtW bbvmMo14897HgmhTa1gbLbrnUFdTa2iZvlS2vKA58Xz/y3X1KOmKFmmbgrPm1tBU qBas5+uXRQrerfF/9dJ8t94FsCRH+t1YZvpVikD6NWQ0fiPghvHdx618SKYTblc5 2fAL3LeXjLa2HI2NoHXBbDMt44Rt3ttZCQ2l87fW5amxJLdSI9HYwopSnsz7erBZ 3x4bmS/pnqSr8mH1LkSenQtXen3UHlaoIiBWCuNqzO7CeWH6vILCCTSw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yuj9r1ak8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 19 Jun 2024 13:59:46 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 45JDQ4pZ034751 for ; Wed, 19 Jun 2024 13:59:45 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2040.outbound.protection.outlook.com [104.47.70.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ys1d9kcdu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 19 Jun 2024 13:59:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=duNJKTv2jCYhjmIoL/922w7axJQELfoXmNrqZAhn4PsZPTmHCHWgb/NOFXrtyQzu1hOhOKlZjlO2h9kcVGOe9G/tT6jJhktF9uSn+CQXop/9iUZEih23yrzBIwYaUN9EzjjTm6PlMPxYnfoDeG0ScyyW6EuwhtiE6FHVNjZhi4uN2nc/x9JglfKTVqfNwL/ew7eUzAKXK8uwFeAxUPolmihKOtyqu9EPGLHIUUp/mYzDs0FIwjpehbNYLi39/gmL3RS0fUyU52MZ78AZaBiVrSveMAeUR+vFCRwiLuGw8oO9ObC2MRmTaQFYDW+Ejc2kuoEKajVwMS1KqwInhDZshg== 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=w01Gf4+7nlsMK4jVu44NjAsZUCQF1gAwLPV3Atw6EIY=; b=mc5Rw+TFQuEVM3c+MIvw0pgAN2esoDoiFps041mjk6QKH3y5PphXGepE1uvdLfjKmZXiGpoqLu9TFxHmUrPLPISCRp8TM1YB5NsTip8p1hWEn6Dv/s5c0cf29C3BYCBmAeQZDE8KDiQs7sa4GK4sReajYITQ632MwZW/RJKZrWcydMldU/kQYhQyzg8z6LopplEFbS/y19FCvDUalavcj8tIs3yo0invYv3uVtyYO5vTVnttTSjFQa8mDGGTtJqFfGjJtn7GxvFyTUDUZPSIlCo80S0iimgkLFXFtl43/Psapx6gSG/HqC3hcl93Ucpsa7FVDpruId+DHOMQKI32gQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w01Gf4+7nlsMK4jVu44NjAsZUCQF1gAwLPV3Atw6EIY=; b=x/6LfGM9ts6F7mNPWyEcToWndG79Sy9MWD9GJUp2Vy61yw5n2J/PJ4MJGvdyKotDu44Gdel84ZCsgVwbZ8ufOToJ5utCwhyQIHN1xp/A2amkk8x9xAYkDKYDk3Pm7jyMzZ5D1RAHMmKCH29/lR7RLqd7+jcPoItzVAOWvYwXz+0= Received: from MW4PR10MB6608.namprd10.prod.outlook.com (2603:10b6:303:22e::8) by CH0PR10MB7484.namprd10.prod.outlook.com (2603:10b6:610:182::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30; Wed, 19 Jun 2024 13:59:42 +0000 Received: from MW4PR10MB6608.namprd10.prod.outlook.com ([fe80::b53a:ccc1:c190:c5df]) by MW4PR10MB6608.namprd10.prod.outlook.com ([fe80::b53a:ccc1:c190:c5df%6]) with mapi id 15.20.7698.017; Wed, 19 Jun 2024 13:59:42 +0000 From: Nick Alcock To: binutils@sourceware.org Subject: [PATCH] libctf: fix testsuite bugs revealed by -Wall Date: Wed, 19 Jun 2024 14:59:38 +0100 Message-ID: <20240619135938.155919-1-nick.alcock@oracle.com> X-Mailer: git-send-email 2.45.1.275.g567cb0950c X-ClientProxiedBy: LO6P123CA0004.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:338::11) To MW4PR10MB6608.namprd10.prod.outlook.com (2603:10b6:303:22e::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR10MB6608:EE_|CH0PR10MB7484:EE_ X-MS-Office365-Filtering-Correlation-Id: f9a5712d-119a-42be-e257-08dc9068118d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230037|366013|376011|1800799021; X-Microsoft-Antispam-Message-Info: CTraHX0/42W7GE6gUERxeBKmYDTUeSYghhFP57XsqrKBrJTpLJwGYPhbvJskz+J9sqfG24LQNSOAjeTmmerCGtee7AcU41fD0Q3phmPSHhDq7s1PGwRykrjLjVTXH2C5+VTBsalJKD7Zv6Npjw/mlgN4/z0JClgxkUD6qXnN1v30bVKwIGIrSFaTk6o0qlXWD8weXVRKgaxdHSiK7SoPsHi8RAtByJnz69gKJvGl8gPVm4+Jn29xXKMcUn1deONEjgaYYJVKtJKkgzuWWGELB33xJj/WcmTJBBxknI2/rKEfhwNOfxY6yg0XYagvnQ/PMnDUjlXoWuhiLy/8KZL3pxY04A0/fLOJedSXmqrWesxUEPdbTCjfSTGbLQW+HWl9gk0us11tSw+e/Lf3JM+E8sx4OdAMynTBx/gvJsO1cNNQYyshhFvDYtp7129m24DCdmuFVaLTZKVIeP7JJ7hOooOmP0iyGZzxY46tK9eovxjYi32ioqk4jNQnOhs2MWBMMelEujlNQvGgz7ue+Z/EOpzUdMR8bl19Ax6Zq9OxAzxHFNiwS1DGKS1qfjDAvpNZuR8twOyHNVMByj0Go19ckpPoQ4b9kXPWXLAww4evAxVWlhrLscDx9QPtWIsdu1Ox4+et8aaHmTEocZ7JPKZ+Vx1FasdHgKiIr/dKhCO8Ov3R9AB12YNftSx0OhH9X3I7V3Gyu3oK8CxxeCcTSAhZxwCIi6uLwuEFvE9/yqtEJAXIIpoqw7Zz+vaNrBzEwfhp9UsFNYWZ48CzWiYmvRjdWRCyaAE57rotmLSiSvXaErFQTde1w2xTwsNZX5CObA0jnREPJYI8bLm5af3ltxG9F3+PbarhBpB9BsoCtqu1ODNCkOMSv4v8TBBbTN5uGrkkJEi9F5iD8dLgZpz2ssk3MWkNnAO9Is/86rkXDlxo55mlOHucQE9UuDW7FMJIi2E3/9sh8ZWXUjOvgsOG8cgjIWhP/Dy26HLs7/llpZJYDrpflgZWqq2R8dxBQtp8vAnZpSLCbAizdiulI6ifDHglZowvAF5/a7PazSCUTBAjoLaqlV5JrPRHchtGNdhwgguvj1373icbcPAMbV5F+5EuYy5QSpwcI/X1ZDxpD1IiTnafJla0v8g5KWbVrwA/fXTz8/wmZGTuk7IfFM7YGTIwJa1A3Cj4huJus+BLPSDQlqWFdAgkTrikHKw9yH8CQr6qFlb9RdPv5UqoNiXOEjpNRWqm0e8pl2MPZ2wMDPhlNxV9vVr+4/M/XTT2ZxOW4wPxCGDjO6TONO/iQarbf4Gok+nJ88t04OB0wsALYpI1oie33j0FXVanclf8WvnrGf47 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW4PR10MB6608.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230037)(366013)(376011)(1800799021); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UmtMJ8HvaIb6p806oaJaIw8cuWlUR6bEUf26872uU5rv2Akyl14wEZQjocbTZvvKHrEvZdlYalBeaWguZ7lPqQ3e30zgqyWT6QwLEb8MN6i7UPE1GpXGksLVkbIFrv3HzRhQmb0C+UTexHJ9CMWscimVQD9vnuyQuHO//BG/GHSCaB8vfFjBEMDL62crVd3qU/1MNv+jv2w3Zwf42YLY45rcRGvxlaEg//q4eQRJ2OF1Pr3Ex4P4i454oHF6CS+J9ORC9li2fkEGI4qiMG2Bl31X6z5WwLGa2YYgZ2LO6v1HQSJI/Nq3hV2CNJ9zVTcHXXzlEmCKhjiMzF6D2teAlbGBTNAZaubsTSIOssgRpWFrmCj3nIl6njmm/+6hmA1fXxJXlXMGyS5+ELnSgCNtmKgQG310rqlM2g/881zs7Gnxh5WiWMKn7l+1BasggzIEm+LiNf2XEn9i/C4eye/5s9f5dUvFvA+HIStDnkoAdxz92C0qded/RHqizceAqlNUixhCaKDBOaU7xauP+M3b5KF+xDDhFGgCQZQC6GToaBAjAQWaTsSzMvvOz1XOgWJUULZlIfdksIQ7MOwVSursuESTNgwRfmGdWo2LcYVzTTnmpsQEMkVRwvqyEo2rdAUhb5wPcPAOnNrWgPhhXZPMRU0cXhgJK/mqNX0PxhmtcAJIwsxaWjjCeby/ojGE+XSEH4ZPgvnGuke6F0prZ1IT7dSIVeN8Wovnb3R/Mks/fhRx108ZdD6Nu3i0ojnV57w5FPiNRhFUXKE3YDOfbsH1jvQ7jqo2N+iV0XqsoxI5ti/cQrQ8UVFwGEgXroWs7B6wUqJx4qbbXKSYraD6dicZNoMnvhqdIQ9Gpm2jW0l710ajTqrzF1is7/udLR56BdTmi3qexdjE59z2MPHjaJtriBd5lCBf5xEu3pbdnhOfIN3g7+NGUbcpULlgeIRmislII6xFen+uKEWub3TrdAGmxLb8gvZz8d2u6Z0asYtdbi8sCeGQZTJw3LR4+EuQFZZuobLWtpRrsEd22NTfpxIUuDIBLJKACzKntDbHdjdoWWubnC2tvgY6iQeJqdwDsdpKX36K00lzyqVUtLRP5gLhpys3RhfJMHDal7fxLZhEH1GCnU5xLarzkST99eAtrDEKwSiX0jWy6kofDy0Xkk13/lg8t4aKu1xBctqavbEI+cZ1yH6iYRPBkYnKONY9NwMmdDFC6hi5IScx15XPrX9pVSUs2OQ+0zV74HV46gUlWwqpLLxFpsWKQ+KE9TPIuaMFPjrnl3XXUK0IguPG4uDO+VdPIxjy/pBGw/9ZuANHN/ipf8iz2VS1TfdD4+dfUc779AHWm6ZArZWiRhyDmqxX55DNmae0mBDjeqCN+SMIZdfrcyCOnWMgOrw5eGTgFZuOTEFEzMlTOXEDAdxAABw3TRAALDoydiDaN73jBfzTSHL90ntJvwgnTvR93iqkGE/4De71LK7+hytyYyRpkCEMrySHvtlG7mjzrnU+7Bv3YPZz6rC6Sbkzq3y1O704OUwmXMg2cYUsnKCulVkAnXi0Xqss7oimpB/Cj5Rv2VPI5PZLpZPE100Cp6DR9gSiLJfVllVKYBw5bFedEydinOGDEQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: KhHWdgbtC3CmU5txVsLCZA7Hdjsz91pTOCEzPmXBOnOCxpfXFL8+XllmBxyBHZ8ZGlNDMhReIhbQ0LW+jIsjnjtQMiq10zrZwndhudb1cxGuH9LhHB8i/1e8kKguMky7a2rP4AC7gM8KbAEhp+xa1GqSPgfTAKor/VeCi2nBHoElhZlheasEwgWg9T/ldzMY01vRWTBiOgDz7Nurn90ttXxkKairqGJyA0Kn0vZc+g9GTS6amcaLilImeq4q3OyTwm1XirJGuML1Ia61fjgldL8fb8xFYVpLjsBBML/QScdHtXQYySFRyuEIcW1SW9MBnomYv7HW9bb6V2+Bd0YUyu6aKQ0UM3iGcZZ4YMGcEWOXjczXym+Pazno7kuipHR8K8J3+3HZBBMya2+lvMoJ4bGosDdZC5UroZRV5gGlW89XH8JwgC9PKLnS/uNpiDPrSdXTfrp2wwAEZvx5SkdzKtgJS5lc0R+a7l46gYQ8VpJ8m0pN2CdXIsrufDabqUJOLvH2/ZDNEHAVkKrYwL2LmRLMfBogi8gUV/LQs2qxBTG2KXkQWrIY8LCc3tNnBfvyxvG6N3/79tPdTJZlIbNhK3qy1rOV3ETFcJ2GTV5YuW0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9a5712d-119a-42be-e257-08dc9068118d X-MS-Exchange-CrossTenant-AuthSource: MW4PR10MB6608.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2024 13:59:42.7659 (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: Ml1oOqddLHzX2KQIbrBya5warA6qZ0FlQ5FXRmCC8ueo5sYohL39RZsul87QRgaNG9153H8xYRjdS8Td6A/Kgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB7484 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-19_02,2024-06-19_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=994 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406190105 X-Proofpoint-GUID: -K9gZA5HatH9nfb6zk36ZCn7rk1P-0Xu X-Proofpoint-ORIG-GUID: -K9gZA5HatH9nfb6zk36ZCn7rk1P-0Xu X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org Most of these are harmless, but some of the type confusions and especially a missing ctf_strerror() on an error path were actual bugs that could have resulted in test failures crashing rather than printing an error message. libctf/ * testsuite/libctf-lookup/enumerator-iteration.c: Fix type confusion, signedness confusion and a missing ctf_errmsg(). * testsuite/libctf-regression/libctf-repeat-cu-main.c: Return 0 from the test function. * testsuite/libctf-regression/open-error-free.c: Fix signedness confusion. * testsuite/libctf-regression/zrewrite.c: Remove unused label. --- .../libctf-lookup/enumerator-iteration.c | 15 +++++++-------- .../libctf-regression/libctf-repeat-cu-main.c | 2 +- .../testsuite/libctf-regression/open-error-free.c | 2 +- libctf/testsuite/libctf-regression/zrewrite.c | 3 --- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/libctf/testsuite/libctf-lookup/enumerator-iteration.c b/libctf/testsuite/libctf-lookup/enumerator-iteration.c index e46dad6dc70..78cb5a3cc0d 100644 --- a/libctf/testsuite/libctf-lookup/enumerator-iteration.c +++ b/libctf/testsuite/libctf-lookup/enumerator-iteration.c @@ -23,8 +23,8 @@ print_constants (ctf_archive_t *ctf, const char *name) { char *foo; - printf ("%s in %s has value %i\n", name, - foo = ctf_type_aname (fp, type), val); + printf ("%s in %s has value %li\n", name, + foo = ctf_type_aname (fp, type), (long int) val); free (foo); ctf_dict_close (fp); @@ -44,7 +44,6 @@ main (int argc, char *argv[]) int err; ctf_id_t type; ctf_next_t *i = NULL; - const char *name; int64_t val; int counter = 0; @@ -71,8 +70,8 @@ main (int argc, char *argv[]) { char *foo; - printf ("IENUMSAMPLE2_2 in %s has value %i\n", - foo = ctf_type_aname (fp, type), val); + printf ("IENUMSAMPLE2_2 in %s has value %li\n", + foo = ctf_type_aname (fp, type), (long int) val); free (foo); if ((type = ctf_add_enum (fp, CTF_ADD_ROOT, "ie3")) == CTF_ERR) @@ -117,13 +116,13 @@ main (int argc, char *argv[]) if (type != CTF_ERR) { char *foo; - printf ("direct lookup: hidden lookup did not return ECTF_NOENUMNAM but rather %i in %s\n", - val, foo = ctf_type_aname (fp, type)); + printf ("direct lookup: hidden lookup did not return ECTF_NOENUMNAM but rather %li in %s\n", + (long int) val, foo = ctf_type_aname (fp, type)); free (foo); } else printf ("direct lookup: hidden lookup did not return ECTF_NOENUMNAM but rather %s\n", - ctf_errno (fp)); + ctf_errmsg (ctf_errno (fp))); } ctf_dict_close (fp); diff --git a/libctf/testsuite/libctf-regression/libctf-repeat-cu-main.c b/libctf/testsuite/libctf-regression/libctf-repeat-cu-main.c index bfbaf0cc8dc..c1f2f6318c1 100644 --- a/libctf/testsuite/libctf-regression/libctf-repeat-cu-main.c +++ b/libctf/testsuite/libctf-regression/libctf-repeat-cu-main.c @@ -2,4 +2,4 @@ typedef short ret_t; int a (void); int b (void); int c (void); -int blah (void) { a(); b(); c(); } +int blah (void) { a(); b(); c(); return 0; } diff --git a/libctf/testsuite/libctf-regression/open-error-free.c b/libctf/testsuite/libctf-regression/open-error-free.c index edc5f348d5f..7405cdb25f3 100644 --- a/libctf/testsuite/libctf-regression/open-error-free.c +++ b/libctf/testsuite/libctf-regression/open-error-free.c @@ -143,7 +143,7 @@ int main (void) failure after we corrupt it: the leak is only observable if the dict gets malloced, which only happens after that point.) */ - if ((written = ctf_write_mem (fp, &written_size, (size_t) -1)) == NULL) + if ((written = (char *) ctf_write_mem (fp, &written_size, (size_t) -1)) == NULL) goto write_err; ctf_dict_close (fp); diff --git a/libctf/testsuite/libctf-regression/zrewrite.c b/libctf/testsuite/libctf-regression/zrewrite.c index 5e061f10a5f..3ddc354d2e3 100644 --- a/libctf/testsuite/libctf-regression/zrewrite.c +++ b/libctf/testsuite/libctf-regression/zrewrite.c @@ -150,7 +150,4 @@ main (int argc, char *argv[]) write_stderr: fprintf (stderr, "%s: cannot open for writing: %s\n", argv[0], strerror (errno)); return 1; - read_err: - fprintf (stderr, "%s: cannot read\n", argv[0]); - return 1; }