From nobody Tue Feb 10 06:07:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=solinno.co.uk ARC-Seal: i=1; a=rsa-sha256; t=1711563310; cv=none; d=zohomail.com; s=zohoarc; b=Xoc4etqy60YRgREwzg6qUv00cpI1OMB6xEBkK2X//PjOliBrj1ad3lCBihX54EvO/K4KKcpQm1Zf4BVj4TU6Udbnx3wA7fogL7SyhbjQKXlUJgkxT1knGp+J9+VbRmnAywd9kMYCcjY5TcdfupUrT8cnaCgmBKQrAr6/Z/o4mlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711563310; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4aMWJx4o3ukwLNwSR51k3Lw8JMIfk881dG9fT+m+KRY=; b=kyzoHuuFzVW74Y6Pd/sjSYEYLCerlVyZp5CxoEeHzvlCNZ45RDi8rj9771RbZedR0XgOBTyWMdDI60aKEelywOLcPVKH+EfsUSRHN9pjV2J7UdL5kh24fycy9RD0ft1zNgfCdYCi6+VP6tOXYTwMPDpGt9+wGZ3bM2z69MljlSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 171156331042678.61593995180556; Wed, 27 Mar 2024 11:15:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.698690.1090715 (Exim 4.92) (envelope-from ) id 1rpXnS-0005Fc-Dx; Wed, 27 Mar 2024 18:14:46 +0000 Received: by outflank-mailman (output) from mailman id 698690.1090715; Wed, 27 Mar 2024 18:14:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rpXnS-0005EH-5N; Wed, 27 Mar 2024 18:14:46 +0000 Received: by outflank-mailman (input) for mailman id 698690; Wed, 27 Mar 2024 18:14:14 +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 1rpXmw-0004q7-BP for xen-devel@lists.xenproject.org; Wed, 27 Mar 2024 18:14:14 +0000 Received: from doppler.solinno.uk (8.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.9.a.d.0.6.f.d.1.0.b.8.0.1.0.0.2.ip6.arpa [2001:8b0:1df6:da9::18]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cfdbe840-ec65-11ee-afe3-a90da7624cb6; Wed, 27 Mar 2024 19:14:12 +0100 (CET) Received: from folly.solinno.co.uk (folly.dyn.solinno.co.uk [192.168.2.135]) by doppler.solinno.uk (Postfix) with ESMTPSA id ADF358009E; Wed, 27 Mar 2024 18:14:11 +0000 (GMT) Received: by folly.solinno.co.uk (Postfix, from userid 1000) id 822C5202A6; Wed, 27 Mar 2024 18:14:11 +0000 (GMT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: cfdbe840-ec65-11ee-afe3-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=solinno.co.uk; s=mail; t=1711563251; bh=MMPqjL3hBPQ8fBBa6Taj4NhI2UexT0xGooHYTZT9+Zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OD29/j6CgXPuqSW/8SMhaMdl//ep46BSk4GQ2rbKH8yxefhIuV+Z6BTmYaHYc3mLd 96BJiG0dRXZZZJTVG0alKblewuibIn4PTde+kWAmZA73MvEdt47rcKuVmiP/qmoPC3 CmNCLwxS75HZ3BAgxscgbH7RU89ROVQM1KqutUkk= From: leigh@solinno.co.uk To: xen-devel@lists.xenproject.org Cc: andrew.cooper3@citrix.com, anthony.perard@citrix.com, slack@rabbit.lu, Leigh Brown Subject: [PATCH 1/6] tools/misc: xenwatchdogd: use EXIT_* constants Date: Wed, 27 Mar 2024 18:13:48 +0000 Message-Id: <20240327181353.10951-2-leigh@solinno.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240327181353.10951-1-leigh@solinno.co.uk> References: <55416d60-cae7-4e79-8bde-bc07ee9e3830@suse.com> <20240327181353.10951-1-leigh@solinno.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @solinno.co.uk) X-ZM-MESSAGEID: 1711563311952100009 Content-Type: text/plain; charset="utf-8" From: Leigh Brown Use EXIT_SUCCESS/EXIT_FAILURE constants instead of magic numbers. --- tools/misc/xenwatchdogd.c | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/misc/xenwatchdogd.c b/tools/misc/xenwatchdogd.c index 254117b554..2f7c822d61 100644 --- a/tools/misc/xenwatchdogd.c +++ b/tools/misc/xenwatchdogd.c @@ -17,37 +17,37 @@ void daemonize(void) { switch (fork()) { case -1: - err(1, "fork"); + err(EXIT_FAILURE, "fork"); case 0: break; default: - exit(0); + exit(EXIT_SUCCESS); } umask(0); if (setsid() < 0) - err(1, "setsid"); + err(EXIT_FAILURE, "setsid"); if (chdir("/") < 0) - err(1, "chdir /"); + err(EXIT_FAILURE, "chdir /"); if (freopen("/dev/null", "r", stdin) =3D=3D NULL) - err(1, "reopen stdin"); + err(EXIT_FAILURE, "reopen stdin"); if(freopen("/dev/null", "w", stdout) =3D=3D NULL) - err(1, "reopen stdout"); + err(EXIT_FAILURE, "reopen stdout"); if(freopen("/dev/null", "w", stderr) =3D=3D NULL) - err(1, "reopen stderr"); + err(EXIT_FAILURE, "reopen stderr"); } =20 void catch_exit(int sig) { if (id) xc_watchdog(h, id, 300); - exit(0); + exit(EXIT_SUCCESS); } =20 void catch_usr1(int sig) { if (id) xc_watchdog(h, id, 0); - exit(0); + exit(EXIT_SUCCESS); } =20 int main(int argc, char **argv) @@ -56,44 +56,44 @@ int main(int argc, char **argv) int ret; =20 if (argc < 2) - errx(1, "usage: %s ", argv[0]); + errx(EXIT_FAILURE, "usage: %s ", argv[0]); =20 daemonize(); =20 h =3D xc_interface_open(NULL, NULL, 0); if (h =3D=3D NULL) - err(1, "xc_interface_open"); + err(EXIT_FAILURE, "xc_interface_open"); =20 t =3D strtoul(argv[1], NULL, 0); if (t =3D=3D ULONG_MAX) - err(1, "strtoul"); + err(EXIT_FAILURE, "strtoul"); =20 s =3D t / 2; if (argc =3D=3D 3) { s =3D strtoul(argv[2], NULL, 0); if (s =3D=3D ULONG_MAX) - err(1, "strtoul"); + err(EXIT_FAILURE, "strtoul"); } =20 if (signal(SIGHUP, &catch_exit) =3D=3D SIG_ERR) - err(1, "signal"); + err(EXIT_FAILURE, "signal"); if (signal(SIGINT, &catch_exit) =3D=3D SIG_ERR) - err(1, "signal"); + err(EXIT_FAILURE, "signal"); if (signal(SIGQUIT, &catch_exit) =3D=3D SIG_ERR) - err(1, "signal"); + err(EXIT_FAILURE, "signal"); if (signal(SIGTERM, &catch_exit) =3D=3D SIG_ERR) - err(1, "signal"); + err(EXIT_FAILURE, "signal"); if (signal(SIGUSR1, &catch_usr1) =3D=3D SIG_ERR) - err(1, "signal"); + err(EXIT_FAILURE, "signal"); =20 id =3D xc_watchdog(h, 0, t); if (id <=3D 0) - err(1, "xc_watchdog setup"); + err(EXIT_FAILURE, "xc_watchdog setup"); =20 for (;;) { sleep(s); ret =3D xc_watchdog(h, id, t); if (ret !=3D 0) - err(1, "xc_watchdog"); + err(EXIT_FAILURE, "xc_watchdog"); } } --=20 2.39.2