From patchwork Thu Apr 6 09:18:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 13203031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6F749C76196 for ; Thu, 6 Apr 2023 09:18:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.518789.805648 (Exim 4.92) (envelope-from ) id 1pkLlC-0007Pg-Hd; Thu, 06 Apr 2023 09:18:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 518789.805648; Thu, 06 Apr 2023 09:18:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pkLlC-0007PZ-Du; Thu, 06 Apr 2023 09:18:26 +0000 Received: by outflank-mailman (input) for mailman id 518789; Thu, 06 Apr 2023 09:18:25 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pkLlA-0007PT-TN for xen-devel@lists.xenproject.org; Thu, 06 Apr 2023 09:18:25 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f8cc340a-d45b-11ed-85db-49a42c6b2330; Thu, 06 Apr 2023 11:18:22 +0200 (CEST) Received: from mail-bn1nam02lp2045.outbound.protection.outlook.com (HELO NAM02-BN1-obe.outbound.protection.outlook.com) ([104.47.51.45]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 06 Apr 2023 05:18:19 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by CH2PR03MB5237.namprd03.prod.outlook.com (2603:10b6:610:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Thu, 6 Apr 2023 09:18:16 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::48a7:d1ab:897:acda]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::48a7:d1ab:897:acda%6]) with mapi id 15.20.6254.026; Thu, 6 Apr 2023 09:18:16 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f8cc340a-d45b-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1680772702; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=b86fja9ztHW6IR8ClYPj80TtEDvVmQLZHm9O83fq7MY=; b=W3f3tELm6H/Hf6gcDEbhdl02fg4o56//CNrFDMBkatgM9j4ftNEjon1+ D6zx7A+IpMH4+V+Xhvd2Mxaatr6AQd251xOJU3v7vlnnOk8ldDTldSJuz VinhDfw7JneaDWvq6NvBGnJm3IcGxAAVD0EmCe6iYR/Y/kQZgpJuXXvx7 A=; X-IronPort-RemoteIP: 104.47.51.45 X-IronPort-MID: 104565972 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:PCW4NaJoK4wjPGyxFE+Rz5QlxSXFcZb7ZxGr2PjKsXjdYENShWdRn WVLWjiGOvbYYzOnf9t3aN6/9h8Cvp/UmNQ2SQZlqX01Q3x08seUXt7xwmUcnc+xBpaaEB84t ZV2hv3odp1coqr0/0/1WlTZhSAgk/rOHvykU7Ss1hlZHWdMUD0mhQ9oh9k3i4tphcnRKw6Ws Jb5rta31GWNglaYCUpJrfPTwP9TlK6q4mhA4gRgPakjUGL2zBH5MrpOfcldEFOgKmVkNrbSb /rOyri/4lTY838FYj9yuu+mGqGiaue60Tmm0hK6aYD76vRxjnVaPpIAHOgdcS9qZwChxLid/ jnvWauYEm/FNoWU8AgUvoIx/ytWZcWq85efSZSzXFD6I+QrvBIAzt03ZHzaM7H09c5TK2dB8 uM9BQk2TQCSnfq58p6DR+pV05FLwMnDZOvzu1lG5BSBV7MMZ8mGRK/Ho9hFwD03m8ZCW+7EY NYUYiZuaxKGZABTPlAQC9Q1m+LAanvXKmUE7g7K4/dupTSOpOBy+OGF3N79YNuFSN8Thk+Fj mnH4374ElcRM9n3JT+tqyrw27GSzHyhMG4UPK+i7+9AkACx+kMWJRMLUX2rp8mZ2lHrDrqzL GRRoELCt5Ma5EGtC9XwQRC8iHqFpQIHHcpdFfUg7wOAwbaS5ByWbkAHSThbYdBgq84yRhQtz FaCm96vDjtq2IB5UlqY/7aQ6Dm0YC4cKDdYYTdeFVdYpd7+vIs0kxTDCM55F7K4hcH0Hje2x C2WqC85hPMYistjO7iHwG0rSgmE/vDhJjPZLC2ONo55xmuVvLKYWrE= IronPort-HdrOrdr: A9a23:6QOZb6NUjsdiqsBcTuOjsMiBIKoaSvp037BL7TEVdfUxSKb0qy nAppgmPHPP5wr5IUtQ/uxoW5PwI080l6QU3WB5B97LYOCBggWVxepZnOjfKlPbehEWwdQtsZ uII5IUNDQpNykBsS8h2njBLz/8+qjgzEl1v5ak856yd3AWV0kOhz0JczqmLg== X-IronPort-AV: E=Sophos;i="5.98,323,1673931600"; d="scan'208";a="104565972" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C8xNq3oRb7VmN0cOOS3xR+/cJyW6MpesmT4uBtWuSj4MWt6qAdmGPYVKqabs3Cv3uWojdV5QJzwvcZUKwIeXitKV+8xnmN8cZ+FAh4gBFYMfIXfKLF+U8mA4C3diyS/nl7HkOLh9BqDSvPuLDIMBsBWlBir18GTKAu5gzbsJ9E4K/gdItVVRdvpTpMuMfcqzs1bFGJbt/WgjcY1RY9gWyZKyviMMaHZ8z/p/EH8pCAPEwBBi3RYYT0z3s1tMdB+EI4dXJawHUsZ6J1obXw29meFddreNTD3ugZ/ZKuDE74SEgkeqKtSe88yPdjZqsWFL/iO1/5MAqmMWwN5s6n8z6w== 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=nnCA7B702KreQwdKNNPADcBQDwWIhYrArbxnmVXIaVQ=; b=fbeeVzboX55rGvvwI/c99TC0gDegBVWafk/j4PfFdAgQIFl0FcXjcF8ARgxYusCYWB4L667FizjWMc+t0i96UzR7d4uHNJNhvxg1R66pE0waP+MlbuR+3sedBxx/gPuGJP0VjN/MZxaDLScU9cosx+3FoSCuORLP7D4FATZt7ELvJBXwj7r1Aigp5wVjvkddoZ4u7GmrgdYwX3/aGyM/OSfnsqFG6Ow8NmtkQTvMxDNSoXIqt7x82zvnM7SJawvrZK/a9CHPQ4ZXRBauiDrcP/fu9MOg+GWsBIzjQwt+4ltWsdCtTbxZewogiwwjU4tLmhTyr9cpc2ojXc0cws9hNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nnCA7B702KreQwdKNNPADcBQDwWIhYrArbxnmVXIaVQ=; b=nWUEDexLPu1CjrQiNvZNAs7jniUtBMzVS4Ct64mNPCKngRmy3Y7CcZD8PtObmDeM2vPGdEDdB9crA89Rf6gfUNZ9cGoSqWogdmRY4nsNAMdYp2zBVFRIWv2NBcqyCoQYsF5OCMbLXj+xUH7Xv/jYquQkbe2gKa8PFPPEQMda4N0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Konrad Rzeszutek Wilk , Ross Lagerwall Subject: [PATCH] livepatch-tools: remove usage of error.h Date: Thu, 6 Apr 2023 11:18:07 +0200 Message-Id: <20230406091807.49028-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.40.0 X-ClientProxiedBy: LO2P123CA0091.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:139::6) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|CH2PR03MB5237:EE_ X-MS-Office365-Filtering-Correlation-Id: 994f8dae-6a35-4811-52a4-08db367fda7d X-LD-Processed: 335836de-42ef-43a2-b145-348c2ee9ca5b,ExtAddr,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Txfqyi/JpK/S5syxTV94OEV7i6h7Ke/14BKTAFEZzVdPISYfX6LL9Y+EXQ8euQh872rwmQJaSSAtz3PUCSdavELmxNW1LvRlXhJ+qD/2eFQSZ2IEXhg9xbswKWAZwPTkANhZ/3OL3+8ERQPFeZgxbu/mb3D2fOM5lGp4wnZL07RgFkDsOScTeZGcLjqnD/JgSmeiRidjCbz6wZ2kXLLt9WP5deqZJ92nfBd/GG9RQSZ9UEOTs2k0VxopKRRrwvktXo+2+QiXJ3X7oDDc7QIvln9Zr1QF52ttIJR3LpjM5VmEUfiCZEwK98FgdBMGRz3s9nPVwZszwilP1E7CHHwQV6RAb87axj0qzW1sYkZxLBxmKd9WVwQzu10ioY1wD1dEhPCJOaAiB2yHQM5SVEScSnyyMOjRk8Xj8Dr1wgRZ/DQcJ2xQO27l4BtOHBWoybskzC71vu0xXKp/tQj9gMSlmXnqiX1ZP6xlro9QJf9rvC5pHWwXHd9XeptR2p8SDIkxUDoYmRSiwsQ8MtSKK0gunrT7CrpF+zGDbxLNvzCbuL+PXeUwJnTqDeNbRerP7IHC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(396003)(366004)(39860400002)(346002)(451199021)(316002)(186003)(6506007)(26005)(6512007)(1076003)(2616005)(6486002)(36756003)(6666004)(107886003)(83380400001)(478600001)(54906003)(86362001)(8936002)(82960400001)(41300700001)(2906002)(5660300002)(38100700002)(66946007)(66476007)(66556008)(6916009)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?eBj0MdoPYyHNHnaEuZaJXAS6iGNc?= =?utf-8?q?6nvjiRRGsqPNKY+6Wa181G+Z/LGzeh5ZJlPBSnHOE9rzUN5NhL5T32Cv/e5bHxoDu?= =?utf-8?q?b8D9V1TZ6a4Px2h2Jo33VLf2R4DjAALQxMqOFLR9gAkJl2sbDT0OR9O5eDzHwvSVE?= =?utf-8?q?RliwCZNfEjoYzWG9eIJBAcBM8nmS7IHP9do3km9THwjwKajxkR3vI8iWk5f0DrGPe?= =?utf-8?q?YKeDBV9kbw5EsYi/yLYAyqlwAnb6vpbnYiwJRz2uZk2XYNKydVSBIOZ3oMDmFMpIA?= =?utf-8?q?uAFdO0REZzekgJD46d995cbRzdaFXcK8C0onaJzx1iifUXorOlD7mac67QhIaowUc?= =?utf-8?q?fZF+kqS+f9b/6OCNLX8Fm8zEp4HL21S+qK0CVgx7QcQ36l9LxaNw6UqRoGxJxCrYa?= =?utf-8?q?EV2xlE22NCpWlc10nZqIiLljfyJMVNNDKtOwaO5AB2ImeY1KUREgbEVFe6glXBFmf?= =?utf-8?q?NV+RGzWcg0SzLnBwW7sIxbVPvCBf4Nz3Ffgc584npEZFIk65vlLSKMCzZkSqAUXPS?= =?utf-8?q?jn4YdEB6hjw8LNcTRkyjqlV1ez1ZoFPby08Td7jL3+IbDR5yDuQ4Gx86FYc0IUxOU?= =?utf-8?q?ye+mffpamGTkpwp5Oa1eFJOqi27YpymvygM1f59IDS+UPRtfBFOR2p2BfVMYYpWJU?= =?utf-8?q?f4jhAgkg1X7Znrp+7kNc5BRo3kZvL+6A1cu4X8JpZD+8hWbZ+iWOQB+9iAJi7XjHl?= =?utf-8?q?cCNZ5OGhCkGSbTUSBsd4thTpQfVNAwiCBlTHit2cinGprDCTGqC6nmJg9sFpGXmh+?= =?utf-8?q?u8ZWuKa81vZj+YvK0O4FLrf6G0uByAnsP2xBAa5aaBjO81AbxY1499W28H6HL/3xV?= =?utf-8?q?w2cPIdY0nRSGHAyhhNFZerxbgiphncb4zqFBPThkPEBsUVpbPj4sfQ7zaT3ZTjWNG?= =?utf-8?q?gaeStxqPqalH7BP2csPB8hYpeGeMRwlY9N2tHChkTIMT2pJpm86AizOS+jWStC26C?= =?utf-8?q?u3SyDhH/6ntemk4QHdGZGA++PnBG3Y074EVeqrUcxbest5JiTfhbByoANebyJrEMJ?= =?utf-8?q?L0C6XvvrCUipENj6l99u51kKAr4vKwpnQmw13E164R6MdejBYNjQ5mL3lF30LZcLY?= =?utf-8?q?nq2WXC7DlKuFVOlvSCHeRgy3xwfSAEPIaLAJvv+c9phnLIgmv7/uxflSJdsatOWMk?= =?utf-8?q?6b82XDKqT8CYCDhPKEFHCpbFu4DCdoZWcptdNERTJe0pTyUNENBkAblDFEKX1lhM4?= =?utf-8?q?5gHBtumAmeu12da3YPyrNdQBh1yYfSbnyOIjFKZM2xPhDP6d2GSrL/NALSszFhYmN?= =?utf-8?q?82kMkxB4eaOEl+eWyL04UDOUW7hqx5fBrhVlQeGA1O8wHjVSe7hsg5LhvciSJXiPK?= =?utf-8?q?05kBJGe4ZxF8Q9QWg++unEWAUFgwF+1TvHZ8Ax2jE5qbuctfBrysiPaJPh/mXiFWg?= =?utf-8?q?0sp4ecwpyU3Z5dAtEHJSQgT8+vpWtc35vnIa52UHIGqdHwkNTrSQ9Wa7EWIFXMI8B?= =?utf-8?q?spqui2JpyCI7lkVGGlHejp+etUM+bBVqIVs3exRxHvElEA/BCUTaa9a+a39WHA3D4?= =?utf-8?q?1TZ0emyfNml2?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: T6HaCGxBfx3BWrlvkPsX/Uz5TnRCWLfp92ysKg2JPTG1cDgWPUXpnyE0TKtGZM76b08Im+j4UlActZUi+/LBn+kfjM46rJrnyw1soDsfTJdVz9ThCvpmtC9j8FF1GnSLlki5dYj+aqOq23wG/i53a50HTvk7umsQ6IqgIyQN7+DSYpTHjzfUixQKmrXYRi6SN6RYKX2eBhp+o3Oq7HVlyo2uWbS1VwxZL6JcdKGJi78h2d25goyAXSNFl4TqZcpgmNVUYzGoZqYAdSh7VTOANviccgKwjPkO+msi0XUrXfnFAYZn8uVMmM9E9AQmRjVjYqBzQV7vkdga7u0HRCDOmAKOeic0VqkmlXXoVYrWLD1dw/DChszd3QBTzAFdwB8VVXE6gHlVZUviW+6aqFZn4wX3X0UM2rRMQ5XH8U56b7IMYG/tiH7G9VhxBA1urzDuZqvD2+whwxFX4cWHFPt1AiL2GEElzUKDDirOzNLa9DgHi7bVeE+Zk5Mt7tLig6f6tQVsYJV6M43FhqRg0zz4d4y13Fb4zDN7G5uvqYv3+XpxdH4suS1HetBEOmAn0hbH48f+8wDYE4/xvOenk/isoOyiH3UxFaRrr3cSdU339h02WdLTAA8hZO0C6JOp81oMbEnQM72IZt10ueHaby+RdW5WOkh04Eror+F9chGfv5FiNA7WEnDyaeOC6XGFb4UJJBZQciXWUYu0FSjUakcBJvn0StlXjBXj9SRIyxtDj4kRfjBqpLfStsDntkpBaygj9LXUyhmHDaTbzhRKH8UJWz2/K0ZG01fQkK6NqFjWCjAawZ5fM8XT+kEPAdgs0ome X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 994f8dae-6a35-4811-52a4-08db367fda7d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2023 09:18:16.0178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /+Rk58LVKarZQjUR0WYvbYpyzKb5FBmroMkER7wA+KUhP6fVEOxInWsm2A4dAnXRbdV+6/IXF2jZZX2nA+lYXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5237 It's a GNU libc specific header which prevents building on musl for example. Instead open code an equivalent replacement for the usage of ERROR() and DIFF_FATAL() macros. Signed-off-by: Roger Pau Monné --- Cc: Konrad Rzeszutek Wilk Cc: Ross Lagerwall --- common.h | 10 ++++++---- create-diff-object.c | 1 - lookup.c | 7 +++++-- prelink.c | 1 - 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/common.h b/common.h index 9a9da79..ec2ea33 100644 --- a/common.h +++ b/common.h @@ -1,18 +1,20 @@ #ifndef _COMMON_H_ #define _COMMON_H_ -#include - extern char *childobj; #define ERROR(format, ...) \ - error(1, 0, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__) +({ \ + fflush(stdout); \ + fprintf(stderr, "ERROR: %s: %s: %d: " format "\n", childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ + exit(1); \ +}) #define DIFF_FATAL(format, ...) \ ({ \ fflush(stdout); \ fprintf(stderr, "ERROR: %s: " format "\n", childobj, ##__VA_ARGS__); \ - error(2, 0, "unreconcilable difference"); \ + exit(2); \ }) #define log_debug(format, ...) log(DEBUG, format, ##__VA_ARGS__) diff --git a/create-diff-object.c b/create-diff-object.c index 780e6c8..d8a0032 100644 --- a/create-diff-object.c +++ b/create-diff-object.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/lookup.c b/lookup.c index 39125c6..b440102 100644 --- a/lookup.c +++ b/lookup.c @@ -28,14 +28,17 @@ #include #include #include -#include #include #include #include "lookup.h" #define ERROR(format, ...) \ - error(1, 0, "%s: %d: " format, __FUNCTION__, __LINE__, ##__VA_ARGS__) +({ \ + fflush(stdout); \ + fprintf(stderr, "%s: %d: " format, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ + exit(1); \ +}) struct symbol { unsigned long value; diff --git a/prelink.c b/prelink.c index 2039e5b..18c5159 100644 --- a/prelink.c +++ b/prelink.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include