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 9A63E64DB; Thu, 18 Mar 2021 00:13:07 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4B10664BF; Thu, 18 Mar 2021 00:12:55 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 478576443; Thu, 18 Mar 2021 00:12:53 +0000 (UTC) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by atuin.qyliss.net (Postfix) with ESMTPS id 1AE2164B8 for ; Thu, 18 Mar 2021 00:12:51 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6661D1FD3 for ; Wed, 17 Mar 2021 20:12:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 17 Mar 2021 20:12:49 -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=pI+f2yAf+uywYtciAbEqqkmoOW iqvuAZvThofvlzysk=; b=EH/Yy0FAKA9INhiXKlWQX0D4knPsZbDPYpDrc2pd2G CB1b6jQ8flI0A4VVC19EFIoz0nQ6pnr9g8VjMvEZ+gUb0zVsqpCK/oXKsn2sCs/K N6HWsvgi1fEic3Bn3o0u1OZhlOPnCV8WfllKijbpXXNyHP2sSBXXOn4oi/mU0oRW o0q4adA/guG9vw95zsDXGSVqgClR6BtF+pMtNPUUfEPezmiVKRVLC+gC+qQqIwCE 9FWxiAih79o/j47ukwpnLGiB32PNP4vURvrwPuyyf+nVaXxXvSpIzPN7esMeWizn MWBo9V2R4GH97riDq639DngWKdQHVKbHNzICsAJnz/qA== 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=pI+f2yAf+uywYtciA bEqqkmoOWiqvuAZvThofvlzysk=; b=Rxr3gJCWyQ7JzbBaA0/icHjIySUQtz4mb AgOXy/Ue9P8cpLV9wzli3rqgvHXg5XekK30OzYrznU8nHPHjOjwzFa3dspi5iLn+ MMuZ5GJrfDqYNwZybO+E6RquT05WfxVCEd68JOlGwsD8MUGmpLwxUwc56EeFZPgf AodfB31bEZjNm8tG4wb+JpHPp4Yh/1kb7Ev1//LcOJv9staD4OT/DhM/zQctDL4h VaO4Bb+kQP6aPWlNZjtxeU6dL8F9GjjGZY9dyokwNh42SlF/2Hi2x+GKCq0jTPWg SBicILWkqKr+I+1E81tkHmLprs4g8SrXPqNptHnbmeAksD94ByCfw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudefhedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgogfeguddtqddvjeculdegtddmnecujfgurhephf fvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceo hhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeehvdffgffhteeijefgte eftdfghfdvheeuhedvjedugfeggfeljefgleefvefgfeenucfkphepkeegrddukeegrddv fedvrddukedtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght 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 8C73F240054 for ; Wed, 17 Mar 2021 20:12:48 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id C7F111C71; Thu, 18 Mar 2021 00:12:46 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock] Use C11 noreturn instead of GNU attribute extension Date: Thu, 18 Mar 2021 00:12:40 +0000 Message-Id: <20210318001240.3897-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 2BSKX4ZFPYXDJQFPKDYNN4Z64RCPTVDC X-Message-ID-Hash: 2BSKX4ZFPYXDJQFPKDYNN4Z64RCPTVDC 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: --- log.h | 4 ++-- vsockclient.c | 8 ++++---- vsockserver.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/log.h b/log.h index a1b0c16..ea9e9cf 100644 --- a/log.h +++ b/log.h @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross #include @@ -13,7 +13,7 @@ extern enum verbosity verbosity; // Log an error message, followed by strerrno(errno), then exit with // status eval. -void diee(int eval, const char *fmt, ...) __attribute__((noreturn)); +_Noreturn void diee(int eval, const char *fmt, ...); // Log an error message. void elog(const char *fmt, ...); diff --git a/vsockclient.c b/vsockclient.c index ff8b7dc..91e1320 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross #define _GNU_SOURCE @@ -7,9 +7,10 @@ #include #include #include +#include +#include #include #include -#include #include @@ -18,8 +19,7 @@ #include "util.h" #include "vsock.h" -static void ex_usage(void) __attribute__((noreturn)); -static void ex_usage(void) +noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -q | -Q | -v ] cid port prog...\n", diff --git a/vsockserver.c b/vsockserver.c index 2fb4f8e..0317cd4 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross #define _GNU_SOURCE @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -22,8 +23,7 @@ #include "util.h" #include "vsock.h" -static void ex_usage(void) __attribute__((noreturn)); -static void ex_usage(void) +noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -1 ] [ -q | -Q | -v ] cid port prog...\n", -- 2.30.0