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 70550858B; Fri, 19 Mar 2021 03:03:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 866248513; Fri, 19 Mar 2021 03:03:19 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id A28BC84C8; Fri, 19 Mar 2021 03:03:17 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by atuin.qyliss.net (Postfix) with ESMTPS id 8D38084C7 for ; Fri, 19 Mar 2021 03:03:15 +0000 (UTC) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 02BA15C0180 for ; Thu, 18 Mar 2021 23:03:15 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 18 Mar 2021 23:03:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=llpg/1zOUQlch NRaS2CWN28V9zJ4dkgoEIjT3Nxod34=; b=qnfJV2N0sAs97lzWd8+olacpoBskK uvVR0NB1Jf62W/sk8sRxP204PKJF802g76ajOnNRgXxe34scF1egZtk/ZYYqwUN3 jLkiVYAT2CFFlKABI5e9cfqMAywxjpjzhvn2cJ61Cl7CO9di9TtakeBn7BDUzVq+ 7p5JjLt9Oamu+Xk/oexKUrEwIEtRbGXkmtVbR56UVcDP0+rD6XmyHEcMeQSqqsn0 mKAuXWENMgeavho5S/An+8X5QmIgKjXfLCsKTNmBrELlWXij97A1C24P7z8qr286 CJIHWIEgIqRoqnHwuNkZcTxYIxKGrFMkszRywPsYeEu19NzUHWWdVrNrA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=llpg/1zOUQlchNRaS2CWN28V9zJ4dkgoEIjT3Nxod34=; b=Qz6s5s07 n1a27U4Hkwdbmo6Uwzky6SYcpy/fVxviPr69SkfXc3kfg6dNV3Uf4aaminCxsucf SDW2uTVk/mtPPmxLeUKF60gQ0XRvVJbgFH6Yf0Tf2jYpLP1oDv37AmqLX2aOyOPy HLeiHWjkHv/S1NLrLVNolkhlzTk0XTOqoRAIAzItImsFPLHIpmv10ZPovkm7BjsK pMPhvfI8YQSBiqZrYYXSNXeybT/OAp3KNtxxCfE/bC9jlfavA+tXR8ygtMGYU0Bo w4wLy+yKSKcy/RSI01YL/IhuA20+G6xa2Yp7CfX/2+FMxBHiM7jM6qRLwmqkGWi+ HsXR5izblSF9Ew== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudefjedghedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecukfhppeekgedrudekgedrvdefvddrudektdenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshesgi dvvddtrdhqhihlihhsshdrnhgvth 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 667F6108005F for ; Thu, 18 Mar 2021 23:03:14 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 7C86A1EAD; Fri, 19 Mar 2021 03:03:13 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock 5/7] log: add die function Date: Fri, 19 Mar 2021 02:56:51 +0000 Message-Id: <20210319025648.17925-5-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210319025349.8839-2-hi@alyssa.is> References: <20210319025349.8839-2-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 57STPOHDJ72PCDW3HJBSDQYULRNJASIC X-Message-ID-Hash: 57STPOHDJ72PCDW3HJBSDQYULRNJASIC 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: This is useful if we want to provide a more specific error message than strerror can provide. --- log.c | 10 ++++++++++ log.h | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/log.c b/log.c index cdfacd6..8a57105 100644 --- a/log.c +++ b/log.c @@ -62,6 +62,16 @@ void ilog(const char *fmt, ...) va_end(ap); } +void die(int eval, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + velog(fmt, ap); + va_end(ap); + + exit(eval); +} + void diee(int eval, const char *fmt, ...) { va_list ap; diff --git a/log.h b/log.h index 7b40e48..706d42f 100644 --- a/log.h +++ b/log.h @@ -11,20 +11,20 @@ enum verbosity { extern enum verbosity verbosity; +// Functions with an `e' suffix additionally print strerrno(errno). + // If opt is a character that matches a standard UCSPI command line // verbosity option, sets the verbosity appropriately and returns // true. Otherwise, returns false. _Bool set_verbosity(int opt); -// Log an error message, followed by strerrno(errno), then exit with -// status eval. +// Log an error message then exit with status eval. +_Noreturn void die(int eval, const char *fmt, ...); _Noreturn void diee(int eval, const char *fmt, ...); // Log an error message. void elog(const char *fmt, ...); void velog(const char *fmt, va_list args); - -// Log an error message, followed by strerror(errno). void veloge(const char *fmt, va_list args); // Log an informative message. -- 2.30.0