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 4367B67CD; Thu, 18 Mar 2021 00:35:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3BFC067B5; Thu, 18 Mar 2021 00:35:45 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 14E4E6739; Thu, 18 Mar 2021 00:35:43 +0000 (UTC) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by atuin.qyliss.net (Postfix) with ESMTPS id E325B6738 for ; Thu, 18 Mar 2021 00:35:40 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 9F7A61FB0 for ; Wed, 17 Mar 2021 20:35:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 17 Mar 2021 20:35:39 -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=7hva0IqWro0JDQAXUA9tYVj6p6 d1zpi6Hz86tRKUXPQ=; b=umEbPfOb++LY0F2/2euOnhHpxxeEsfeqy202o4B86h OARxblXNGsqRwkgX9nBAhEOBlYBEW96W29uCISxMWm9HonZlc1HlQqZ0g82ahUBX lfq/QNwgjg57NN1sh71uUa2Is6QjyiKzF7ezoOLz01R7AQi33eCm7zUOBuMyYpK+ fxnX6ywRCqNpoULhqKJW9kTIpyjL6u07SS0kraXzAH6jLhsnzSzssm8ct5Ha8i34 GE3LX0lCq1hFfH6F8MMhUlNRl7MTFPIF1tDTzJhfw008nvzGLUGgVxXEtLpkKMdF byb4kzVB1qhKxfWKRoX1UQ9fPx1S1rSf2bJo8cx5Y9+w== 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=7hva0IqWro0JDQAXU A9tYVj6p6d1zpi6Hz86tRKUXPQ=; b=C3p+H88w83mB8WkaJPcUah4SmIyZTvT7R eRs7mbENPmQtlp7Wn0OLggUzunYrx8vR0M8OOXeDRCv3Fhrq2QAUxNRfYYLJbLwQ jfLnpQPZ4vh/jDVyl2dzL72WCBJwmESn1ZHioP/wXJX5QPK1OLlVDwBrxdbTtP/X ASczxLv36+Bf7WYcXfAlDMnHiSyjFpCDk95kAb12cIqOxJqYvu+REO/JQ/nvMAvv 785xZ9nMZUAEQ7lOCB59VHd5/ATqa3OnnPwibljvhCTK/k/dvu9F9moOyRIkYBED IaBhMbA5LlvCAKx02fVDJkV433FPW/CKMjL80MkNvOIj3QnMuJKFA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudefhedgvddvucetufdoteggodetrfdotf 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 2253724005C for ; Wed, 17 Mar 2021 20:35:39 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 3C0701C74; Thu, 18 Mar 2021 00:35:38 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock] Factor out set_verbosity() Date: Thu, 18 Mar 2021 00:35:30 +0000 Message-Id: <20210318003530.13208-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: IUMG6OSF2ZVENU34XFGFNLFGNNSRTCUX X-Message-ID-Hash: IUMG6OSF2ZVENU34XFGFNLFGNNSRTCUX 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 will save some cognitive load when reading main functions. --- log.c | 20 +++++++++++++++++++- log.h | 5 +++++ vsockclient.c | 6 +----- vsockserver.c | 6 +----- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/log.c b/log.c index 385d39f..cdfacd6 100644 --- a/log.c +++ b/log.c @@ -1,15 +1,33 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross #define _GNU_SOURCE #include "log.h" #include +#include #include enum verbosity verbosity = errors; +bool set_verbosity(int opt) +{ + switch (opt) { + case 'q': + verbosity = nothing; + return true; + case 'Q': + verbosity = errors; + return true; + case 'v': + verbosity = all; + return true; + } + + return false; +} + void veloge(const char *fmt, va_list args) { if (verbosity) diff --git a/log.h b/log.h index ea9e9cf..7b40e48 100644 --- a/log.h +++ b/log.h @@ -11,6 +11,11 @@ enum verbosity { extern enum verbosity verbosity; +// 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. _Noreturn void diee(int eval, const char *fmt, ...); diff --git a/vsockclient.c b/vsockclient.c index 91e1320..d25ab13 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -35,13 +35,9 @@ int main(int argc, char *argv[]) while ((opt = getopt(argc, argv, "+qQv")) != -1) { switch (opt) { case 'q': - verbosity = nothing; - break; case 'Q': - verbosity = errors; - break; case 'v': - verbosity = all; + set_verbosity(opt); break; default: ex_usage(); diff --git a/vsockserver.c b/vsockserver.c index 03d9838..4c251b0 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -43,13 +43,9 @@ int main(int argc, char *argv[]) notify = true; break; case 'q': - verbosity = nothing; - break; case 'Q': - verbosity = errors; - break; case 'v': - verbosity = all; + set_verbosity(opt); break; default: ex_usage(); -- 2.30.0