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 70F7ABFE5; Sun, 21 Mar 2021 19:39:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4E5AFBFCB; Sun, 21 Mar 2021 19:39:14 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 697FFBF40; Sun, 21 Mar 2021 19:39:12 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id ECC0BBFC5 for ; Sun, 21 Mar 2021 19:39:09 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 5EBDF5C00C2 for ; Sun, 21 Mar 2021 15:39:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 21 Mar 2021 15:39:09 -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=DrbtFfgwvy59bVd0T23ghvJBqj ZMKpii2p3Uhji7yM4=; b=a9IZLubIiwDdu3H2xR0FvLPyCe7fWilgAw0q9JQBfs Hj/bcFqAkLueUc/G7vK0mAF9vF8LjTG+BgsNv2ZIriIcFs0GVV+8tV2u4Ff2+5b/ d1FReRm6tp60lKsM+EQhyXsOK5KaT91KyOBEkaNZkPH+wmUy0iUMJvSzf9f3CuXS 7u4nTefKmaB6GC4vvFEkgiDcKQCPRsUP+G1OsxKmgN3jgFfUatOtyxFLKrLmDlQZ MWzkQ7bPlj4F4F5ZHcG94n3Lx6qi6nttG/Bb7IHnWmKCmrY5Tcl5FnUgJ5qcnd7f cCr1kcr45SHQy0KZM5KYejq/dZTFpe0XMA9Y6P7xI5Zg== 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=DrbtFfgwvy59bVd0T 23ghvJBqjZMKpii2p3Uhji7yM4=; b=kft2LNGpeRMPya3QsgaW748VGCVvtVoEk CxJNO6JgUqJOg50VFpRCSH8njs0EaKv+bUS36+E2g3ezXIf8naogGNJksYP8xkHz HTnWQnkLtTNE/6Slkm3oGbVslU9gQF8JKSJ1GyQgAZyoW2lvAsMRjx+3s6+CqUtK TsF9O04qN5/wEN9eoeXzGw/dhjdpOIl99srhw75sLsy1tz5CNMxuepFir67n4dPZ c0yd3Y/zPx3SNt/F0Upq54RkhsZS2/zNxW83YTSTx0EMyiqVW2z0Z6L2UhqRr3+g FsAJbl58JVd0qlrJy0jzNdaSvobupkgXnnLUH7ScyoaPgYrt05tmQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudegvddguddvjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecuogfggedutddqvdejucdlgedtmdenucfjughrpe fhvffufffkofgggfestdekredtredttdenucfhrhhomheptehlhihsshgrucftohhsshcu oehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhephedvfffghfetieejgf etfedtgffhvdehueehvdejudfggefgleejgfelfeevgfefnecukfhppeejledrvdefuddr vdegfedrkedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from eve.qyliss.net (p4fe7f351.dip0.t-ipconnect.de [79.231.243.81]) by mail.messagingengine.com (Postfix) with ESMTPA id C7E3924025C for ; Sun, 21 Mar 2021 15:39:08 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 0A8C6120E; Sun, 21 Mar 2021 19:39:08 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock] Set up clang-format Date: Sun, 21 Mar 2021 19:39:02 +0000 Message-Id: <20210321193902.21087-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NAJRJCUIPSC6EQFCOJDPDTUEJZ3QSHFU X-Message-ID-Hash: NAJRJCUIPSC6EQFCOJDPDTUEJZ3QSHFU X-MailFrom: qyliss@eve.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: --- I'm not entirely happy with the automatic formatting, but I think it's worth it. .clang-format | 10 ++++++++++ num.c | 2 +- vsock.c | 4 ++-- vsockclient.c | 5 +++-- vsockserver-socketbinder.c | 8 ++++---- vsockserver.c | 27 +++++++++++++++------------ vsockserverd.c | 9 +++++---- 7 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..89313b0 --- /dev/null +++ b/.clang-format @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-FileCopyrightText: 2021 Alyssa Ross + +AlignOperands: DontAlign +BreakBeforeBinaryOperators: All +BreakBeforeBraces: Linux +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +IndentWidth: 8 +UseTab: AlignWithSpaces diff --git a/num.c b/num.c index ac7f0a4..cef71ae 100644 --- a/num.c +++ b/num.c @@ -21,7 +21,7 @@ int getu32(const char *s, uint32_t min, uint32_t max, uint32_t *out) } int getul(const char *s, unsigned long min, unsigned long max, - unsigned long *out) + unsigned long *out) { char *endptr; diff --git a/vsock.c b/vsock.c index 6f1f466..ab8c4bd 100644 --- a/vsock.c +++ b/vsock.c @@ -18,8 +18,8 @@ static void fill_sockaddr(struct sockaddr_vm *addr, uint32_t cid, uint32_t port) addr->svm_port = port; } -static int fill_cid_and_port(const struct sockaddr_vm *addr, - uint32_t *cid, uint32_t *port) +static int fill_cid_and_port(const struct sockaddr_vm *addr, uint32_t *cid, + uint32_t *port) { // Check that this sockaddr info is actually for the socket // type we think it is, or we could get some very confusing diff --git a/vsockclient.c b/vsockclient.c index fbdd20e..d6cc778 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -23,7 +23,7 @@ noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -q | -Q | -v ] cid port prog...\n", - program_invocation_short_name); + program_invocation_short_name); exit(EX_USAGE); } @@ -63,7 +63,8 @@ int main(int argc, char *argv[]) // the same host with no backlog, so retry a few times. { int i = 0; - do fd = vsock_open(rcid, rport); + do + fd = vsock_open(rcid, rport); while (i++ < 3 && fd == -1 && errno == ETIMEDOUT); } if (fd == -1) diff --git a/vsockserver-socketbinder.c b/vsockserver-socketbinder.c index fdcdfa8..97c5442 100644 --- a/vsockserver-socketbinder.c +++ b/vsockserver-socketbinder.c @@ -5,13 +5,13 @@ #include #include +#include #include #include -#include #include #include -#include #include +#include #include #include @@ -26,7 +26,7 @@ noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s cid port prog...\n", - program_invocation_short_name); + program_invocation_short_name); exit(EX_USAGE); } @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) // Parse the `cid' argument. if (!strcmp(argv[optind], "-1")) cid = VMADDR_CID_ANY; - else if (getu32(argv[optind], 0, UINT32_MAX, &cid)) + else if (getu32(argv[optind], 0, UINT32_MAX, &cid)) ex_usage(); optind++; diff --git a/vsockserver.c b/vsockserver.c index b717eee..e45c2ea 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -19,8 +19,9 @@ noreturn static void ex_usage(void) { if (verbosity) - fprintf(stderr, "Usage: %s [ -1 ] [ -q | -Q | -v ] cid port prog...\n", - program_invocation_short_name); + fprintf(stderr, + "Usage: %s [ -1 ] [ -q | -Q | -v ] cid port prog...\n", + program_invocation_short_name); exit(EX_USAGE); } @@ -40,9 +41,10 @@ int main(int argc, char *argv[]) // we've parsed the arguments, so we know what our verbosity // setting is, and consequently whether we should print an // error message about the allocation failure. - alloc_failed |= - argz_add(&binder_opts, &binder_opts_len, BINDIR "/vsockserver-socketbinder") || - argz_add(&daemon_opts, &daemon_opts_len, BINDIR "/vsockserverd"); + alloc_failed |= argz_add(&binder_opts, &binder_opts_len, + BINDIR "/vsockserver-socketbinder") + || argz_add(&daemon_opts, &daemon_opts_len, + BINDIR "/vsockserverd"); while ((opt = getopt(argc, argv, "+1qQv")) != -1) { char *arg = NULL; @@ -53,9 +55,9 @@ int main(int argc, char *argv[]) case 'Q': case 'v': set_verbosity(opt); - alloc_failed |= - asprintf(&arg, "-%c", opt) == -1 || - argz_add(&daemon_opts, &daemon_opts_len, arg); + alloc_failed |= asprintf(&arg, "-%c", opt) == -1 + || argz_add(&daemon_opts, &daemon_opts_len, + arg); free(arg); break; default: @@ -78,15 +80,16 @@ int main(int argc, char *argv[]) ex_usage(); // Add `cid' and `port' arguments to binder options. - if (argz_add(&binder_opts, &binder_opts_len, "--") || - argz_add(&binder_opts, &binder_opts_len, argv[optind++]) || - argz_add(&binder_opts, &binder_opts_len, argv[optind++])) + if (argz_add(&binder_opts, &binder_opts_len, "--") + || argz_add(&binder_opts, &binder_opts_len, argv[optind++]) + || argz_add(&binder_opts, &binder_opts_len, argv[optind++])) diee(EX_OSERR, "malloc"); // Add all of daemon_opts onto the end of binder_opts. It's // okay to multiply to find the size because if it would // overflow calloc would have failed earlier. - if (argz_append(&binder_opts, &binder_opts_len, daemon_opts, daemon_opts_len)) + if (argz_append(&binder_opts, &binder_opts_len, daemon_opts, + daemon_opts_len)) diee(EX_OSERR, "malloc"); free(daemon_opts); diff --git a/vsockserverd.c b/vsockserverd.c index 1abfff9..a056bf1 100644 --- a/vsockserverd.c +++ b/vsockserverd.c @@ -23,7 +23,7 @@ noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -1 ] [ -q | -Q | -v ] prog...\n", - program_invocation_short_name); + program_invocation_short_name); exit(EX_USAGE); } @@ -33,8 +33,8 @@ int main(int argc, char *argv[]) int opt; pid_t child; uint32_t lcid, lport, rcid, rport; - struct pollfd poll_fd = - { .fd = STDIN_FILENO, .events = POLLIN, .revents = 0 }; + struct pollfd poll_fd + = { .fd = STDIN_FILENO, .events = POLLIN, .revents = 0 }; while ((opt = getopt(argc, argv, "+1qQv")) != -1) { switch (opt) { @@ -93,7 +93,8 @@ int main(int argc, char *argv[]) ilog("connection from %" PRIu32 " port %" PRIu32, rcid, rport); switch (child = fork()) { - case -1: diee(EX_OSERR, "fork"); + case -1: + diee(EX_OSERR, "fork"); case 0: // Set up the connection socket on prog's // stdin and stdout. This has the happy side -- 2.30.0