From nobody Fri Apr 28 03:12:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6yMN5Bnqz47rKp; Fri, 28 Apr 2023 03:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6yMN4dhvz41Ps; Fri, 28 Apr 2023 03:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682651536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1FDXrrHy4mhj/rdYHod1IfnZTr1pxaO+3buEfXXsm2M=; b=wj/ZGANDHEikq0zdM6MVUWd27EqmOTZp2jjOMqH8nKNKeLzGnDeAgZ6l0PY9bziyFJVrmK F1CWsduKIHvg/2hl2PTIIlZ1KoCtUHdbfADqeb92incLCUVRR6qUYmujUcE/aDoszpqQSC z8k7TuhI2pHnO8rYUsc4pLQ+oTi2RaMgCf1BvycQY8P62/csd8v20qI0OQSp7QZ1eT8Usq 6TkKDizurgGX2L/sjUAVcW5oLApuMgB90o2thWA6FDesMD+ufT7+D4t9BKLAFbtbJDS0QG 2NEqfI4zQC1oIhBUh/54vpIgMqyEYIgK8vU67xWaT4yKgP2uaEcrE2uGtahLdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682651536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1FDXrrHy4mhj/rdYHod1IfnZTr1pxaO+3buEfXXsm2M=; b=cNOnA4BMsVSGE9q970FHZ91lwPyeoPrlSRZ4FU8gTVJodDOPQgsLTUWvOwISbcVxct5mQl AYgm3cW45ix64SITKme8eBRqO8/z/SOJ+b2N5FqKyHZxXQNrgmPmbuRKTDU5hUZHK9OlKj Jh4PBgvZyI9kXGk7uuEQl0rNtPKcP+/JKr3loTtFxpb1mudhT33qB6drwxYkAhqv9obuf/ C381ELKUX9MuOQtYd1in/OgcCJL/Y4P7bE3t4eWip1/dK9URD8SFcEd8ADCacKQU0hwgLd T21qg2S8pwn20T8JmNRRfYDKMHV9oWNSXHJ2NbdJhdhY5EoPxaURW/cr3vA7vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682651536; a=rsa-sha256; cv=none; b=hMQ6Y6COTLFL8dKN1zriagEigPkUM4imB9qUQ7xHrjuBFzs2b29QXmGUSeT8tBgZeS0pWK jLk5494tw0dkKB5Sf1QTcy+oWfb5sRequRMEeY6dkOEBAF94OL1aAleALAatPI1d6ze3bK 9zplKh3+JoHZ8sns+GlPIbpLYwDq5lUMspPBEYFd3mNwxjqnV2teHwqKnuZKmHx5o9VZyu dzZYjvtd0dm3YH4roWclsO9z82Sh6a26fxE7fFiSa2jCRkVXhVuYgwgy4fw4T8kAPnYX0h +1x5XJzjrQ2pfhqawrQZdISgOsdl0O/FgilEgcxa48lHx5OTykr8ftXiDQcgGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6yMN3j7DzkMp; Fri, 28 Apr 2023 03:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33S3CGnX056495; Fri, 28 Apr 2023 03:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S3CGHV056494; Fri, 28 Apr 2023 03:12:16 GMT (envelope-from git) Date: Fri, 28 Apr 2023 03:12:16 GMT Message-Id: <202304280312.33S3CGHV056494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cae85a647ad7 - main - efiwake(8): style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cae85a647ad76d191ac61c3bff67b49aabd716ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cae85a647ad76d191ac61c3bff67b49aabd716ba commit cae85a647ad76d191ac61c3bff67b49aabd716ba Author: Konstantin Belousov AuthorDate: 2023-04-28 02:58:01 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-28 03:08:09 +0000 efiwake(8): style Sponsored by: The FreeBSD Foundation MFC after: 1 week --- usr.sbin/efiwake/efiwake.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/usr.sbin/efiwake/efiwake.c b/usr.sbin/efiwake/efiwake.c index 67497e2ede03..9d9e808dff19 100644 --- a/usr.sbin/efiwake/efiwake.c +++ b/usr.sbin/efiwake/efiwake.c @@ -25,33 +25,36 @@ * SUCH DAMAGE. */ +#include #include #include #include +#include #include #include -#include #include #include #include -#include -static void usage(void) +static void +usage(void) { - printf("Usage:\n" - " efiwake -- print out current EFI time and wake time\n" + fprintf(stderr, "Usage:\n" + " efiwake -- print out current " + "EFI time and wake time\n" " efiwake -d -- disable wake time\n" " efiwake -e yyyy-mm-ddThh:mm:ss -- enable wake time\n" ); - exit(EX_USAGE); } -int main(int argc, char **argv) +int +main(int argc, char **argv) { + struct efi_tm now; struct efi_waketime_ioc waketime; - int error, ch; - bool enable = false, disable = false; + int ch, error, efi_fd; + bool disable = false, enable = false; memset(&waketime, 0, sizeof(waketime)); @@ -63,10 +66,12 @@ int main(int argc, char **argv) case 'e': if (sscanf(optarg, "%hu-%02hhu-%02hhuT%02hhu:%02hhu:%02hhu", - &waketime.waketime.tm_year, &waketime.waketime.tm_mon, - &waketime.waketime.tm_mday, &waketime.waketime.tm_hour, - &waketime.waketime.tm_min, &waketime.waketime.tm_sec) - != 6) { + &waketime.waketime.tm_year, + &waketime.waketime.tm_mon, + &waketime.waketime.tm_mday, + &waketime.waketime.tm_hour, + &waketime.waketime.tm_min, + &waketime.waketime.tm_sec) != 6) { usage(); } enable = true; @@ -84,11 +89,10 @@ int main(int argc, char **argv) if (disable && enable) usage(); - int efi_fd = open("/dev/efi", O_RDWR); + efi_fd = open("/dev/efi", O_RDWR); if (efi_fd < 0) err(EX_OSERR, "cannot open /dev/efi"); - struct efi_tm now; error = ioctl(efi_fd, EFIIOC_GET_TIME, &now); if (error != 0) err(EX_OSERR, "cannot get EFI time"); @@ -99,7 +103,8 @@ int main(int argc, char **argv) now.tm_sec); if (disable) { - /* It's tempting to preserve the current timer value. + /* + * It's tempting to preserve the current timer value. * However, wonky EFI implementations sometimes return bogus * dates for the wake timer and would then fail disabling it * here. @@ -123,7 +128,8 @@ int main(int argc, char **argv) if (error != 0) err(EX_OSERR, "cannot get EFI wake time"); - printf("EFI wake time: %u-%02u-%02uT%02u:%02u:%02u; enabled=%i, pending=%i\n", + printf("EFI wake time: %u-%02u-%02uT%02u:%02u:%02u; " + "enabled=%i, pending=%i\n", waketime.waketime.tm_year, waketime.waketime.tm_mon, waketime.waketime.tm_mday, waketime.waketime.tm_hour, waketime.waketime.tm_min, waketime.waketime.tm_sec,