From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 15CCE658F; Thu, 18 Mar 2021 00:13:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 7B9EA651E; Thu, 18 Mar 2021 00:13:12 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 17C7E6501; Thu, 18 Mar 2021 00:13:10 +0000 (UTC) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by atuin.qyliss.net (Postfix) with ESMTPS id E62576467 for ; Thu, 18 Mar 2021 00:12:59 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id AB7232042 for ; Wed, 17 Mar 2021 20:12:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 17 Mar 2021 20:12:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=E5F1QOo9eYctXB2dTa+TB8kJdh 7BSLSnG1lpv1ROzg8=; b=fdThwno6YBUr8jk/s8Y7QccPPCfS1h9QjF6+iGyg4f KAjIWCxEzuLjjmcrO7Q1VsiCSrK7560gANFiPxnWVvc+W5POKG5DFFh5I8EQpd79 DlmDocSg5uBkUY+eSNJhcyFH1g26Z6KNGWYnGbmUPLiN+hPb8NTKXBRo5aBDOYsk ohk81tJC5k3uSyxLmQmKboyrohnlIIztB14hUJZQ2khVlLtuA3caor3QNwKXnETu PRM3i6/iOSVLfs16pu6P9NvXP2SPpD7p2yNuyFf/nH9ViJWC39CbIxlW2MqSDDhd eDjje3GoFvzTu+pK/yYY36diHPNbN24lijNOBm9OEfUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=E5F1QOo9eYctXB2dT a+TB8kJdh7BSLSnG1lpv1ROzg8=; b=uCtV0wt7oeHQBSSqwqWGmJmYVUyE7tbhu 03K4zGYYYVMsMUp5X2hdf9mDCRBiHOsfUI2+qanmxM34xqFWt8cksGHQPQnDqidN os935D5CT5jkSZOibouloiBFN+/ITkoyA68Q8iqMe/6oUhCRTzo8FK6u1OO1Hq3m 6efzfR8Bq7BAS2fF0mcFxyegvDpep05AgDx0z2X47QUzZ62S5ZzmnBYrdWHXIkor 1tVamZiHpcQzLMFG8vyrS6P6vT/XYcPaJ5dKKNLlNy+AwrOyB+UaF8qqej+U6TLt bUSM/vDVS0IAt0Y2nqbMNp5YEXASgJFuW/TBOahuho0C2ANOzaJww== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudefhedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgffhvdehueehvdejudfgge fgleejgfelfeevgfefnecukfhppeekgedrudekgedrvdefvddrudektdenucevlhhushht vghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvd dtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p54b8e8b4.dip0.t-ipconnect.de [84.184.232.180]) by mail.messagingengine.com (Postfix) with ESMTPA id 1F94C24005D for ; Wed, 17 Mar 2021 20:12:58 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 3AC6C1C72; Thu, 18 Mar 2021 00:12:57 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err Date: Thu, 18 Mar 2021 00:12:56 +0000 Message-Id: <20210318001256.4078-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 7ATKPEARRAYC2VXHSWVYYJXDBWOYUX7B X-Message-ID-Hash: 7ATKPEARRAYC2VXHSWVYYJXDBWOYUX7B X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: diee is our function that respects the verbosity setting. --- vsockserver.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vsockserver.c b/vsockserver.c index 0317cd4..8f809ec 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -3,7 +3,6 @@ #define _GNU_SOURCE -#include #include #include #include @@ -105,22 +104,22 @@ int main(int argc, char *argv[]) ilog("connection from %" PRIu32 " port %" PRIu32, rcid, rport); switch (child = fork()) { - case -1: err(EX_OSERR, "fork"); + case -1: diee(EX_OSERR, "fork"); case 0: if (dup2(conn, STDIN_FILENO) == -1) - err(EX_OSERR, "dup2"); + diee(EX_OSERR, "dup2"); if (dup2(conn, STDOUT_FILENO) == -1) - err(EX_OSERR, "dup2"); + diee(EX_OSERR, "dup2"); if (conn != 0 && conn != 1) close(conn); execvp(argv[optind], &argv[optind]); - err(EX_OSERR, "exec"); + diee(EX_OSERR, "exec"); } if (waitpid(child, NULL, 0) == -1) - err(EX_OSERR, "waitpid"); + diee(EX_OSERR, "waitpid"); close(conn); } - err(EX_OSERR, "accept"); + diee(EX_OSERR, "accept"); } -- 2.30.0