From nobody Mon May 20 04:08:48 2024 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 4VjPFX5B2qz5LhL9; Mon, 20 May 2024 04:08:48 +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 4VjPFX3jSGz4D1X; Mon, 20 May 2024 04:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716178128; 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=yybiQK/VyqCQH/q2XhClgotq42C2VULSofqOayRiHDU=; b=ussRVE7D1HYwbnXjNR3Y/aXKhbXhv5tNBi6Lpw3Z8ALv4Ozb/coJIbWy69d7Ba8rQHc4Mm ymqb4YeFWEmXV8+vlVGLXoXOlHF2bvzsDVSEw4LG/AcNjHw8K5qBBo/IjKNzGWBvQ6ypF3 /BEu9NUBcpy6zThfUpqTNUpkt4BfU0DWJHVVcn5plqP/u0dKvYxScZjQpgLpFWHqR53r/n zZhnYD+tlQSnjBpc6bI5GNy+fWAyktoQLvkdU0NP0aQlW1KVWNWRaIrYS1xLTJ667d3Ll1 R3rWbtczHCvqn9fevBBlCxvSzkFhsXw3bzOEbd6Ypu0StDdYg0n7ALim8r1DQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716178128; a=rsa-sha256; cv=none; b=cZG4LCO8Zp4XpP9/cSbHE7whGO0/oMupggzc4fcJYyTEHtO1P2mTilC14vmlF4o/BCKKUn 7K+oT4+wRAQoQTIKw2Sx3g7mamZqouub+JQL5gqEWuI6deJ14PNBsS+3ExJPznZF8dqa9O PUi+vvY09yMS8Uv8PlloksKRXEfL/VD/aJ/10Ay+kEeCVjzsipJPsxWtHTaIAmIRRjcbOz jarHWsu/IC2HNO3lk/q8sURxhjueD6MTBR/a1DckNCditP+7fRwEk8wLYnSbSMi+1wsaDa NOJXC081ozR1w/hKGCz+9ANegPev2xIg2N2kGUq10Kwnx25wceBtboTCExtSlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716178128; 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=yybiQK/VyqCQH/q2XhClgotq42C2VULSofqOayRiHDU=; b=VOLIpvpLvfcxcBF7KwEMjwseK6ES527qfUCMMdyWFJ7nRBrg8G963tvjR+uC7FkrD4ce0A uHIxZ0mLTKY0RaIgR2cgakIbj33SbqAHZ5GiWcuHckp9Cse7tJxMOeLAMA0nGABvY1qXI2 QnlLQzdW3u3/gqJjPPGDmXPSKSwgo9qBcXAJrkxSalKUESvsu26YQZg3DP6y0pVx15Hemu 5p5hvuOsva7sFkrSHF+uvDrDXlulqrUltALh2paOdsCLv3oD+HC/gY/fDMtRT+eUftB2CH C1wa6xyG01S+5htIWpUcOBL0mvmc341R0Z2WKYq07JAnxuNmhBB+g2mDlIH73A== 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 4VjPFX3K9VzNDf; Mon, 20 May 2024 04:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44K48mSF081690; Mon, 20 May 2024 04:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44K48mqg081687; Mon, 20 May 2024 04:08:48 GMT (envelope-from git) Date: Mon, 20 May 2024 04:08:48 GMT Message-Id: <202405200408.44K48mqg081687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4cddd20e1ea8 - main - loader/ofw: Style(9) pass over return statements 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cddd20e1ea8b9c622c72edfad3e64f70e9d56a9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4cddd20e1ea8b9c622c72edfad3e64f70e9d56a9 commit 4cddd20e1ea8b9c622c72edfad3e64f70e9d56a9 Author: Warner Losh AuthorDate: 2024-05-19 21:14:43 +0000 Commit: Warner Losh CommitDate: 2024-05-20 04:05:43 +0000 loader/ofw: Style(9) pass over return statements Make these consistent. Some files weren't even consistent with themselves. Make them all either return ( ); or return; Sponsored by: Netflix --- stand/libofw/devicename.c | 4 ++-- stand/libofw/ofw_console.c | 10 +++++----- stand/libofw/ofw_copy.c | 8 ++++---- stand/libofw/ofw_module.c | 2 +- stand/libofw/ofw_net.c | 12 ++++++------ stand/libofw/ofw_time.c | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c index 5e3a789c13db..f6419632c6bc 100644 --- a/stand/libofw/devicename.c +++ b/stand/libofw/devicename.c @@ -101,12 +101,12 @@ ofw_common_parsedev(struct devdesc **dev, const char *devspec, const char **path idev = malloc(sizeof(struct ofw_devdesc)); if (idev == NULL) { printf("ofw_parsedev: malloc failed\n"); - return ENOMEM; + return (ENOMEM); }; strlcpy(idev->d_path, devspec, min(rem_path - devspec + 1, sizeof(idev->d_path))); *dev = &idev->dd; if (path != NULL) *path = rem_path; - return 0; + return (0); } diff --git a/stand/libofw/ofw_console.c b/stand/libofw/ofw_console.c index 4fbd43d3f612..75f9bfba0968 100644 --- a/stand/libofw/ofw_console.c +++ b/stand/libofw/ofw_console.c @@ -62,7 +62,7 @@ ofw_cons_probe(struct console *cp) static int ofw_cons_init(int arg) { - return 0; + return (0); } void @@ -90,7 +90,7 @@ ofw_cons_getchar(void) if (saved_char != -1) { l = saved_char; saved_char = -1; - return l; + return (l); } /* At least since version 4.0.0, QEMU became bug-compatible @@ -109,12 +109,12 @@ ofw_cons_poll(void) unsigned char ch; if (saved_char != -1) - return 1; + return (1); if (OF_read(stdin, &ch, 1) > 0) { saved_char = ch; - return 1; + return (1); } - return 0; + return (0); } diff --git a/stand/libofw/ofw_copy.c b/stand/libofw/ofw_copy.c index b855a5b41d96..17a46fe4e480 100644 --- a/stand/libofw/ofw_copy.c +++ b/stand/libofw/ofw_copy.c @@ -119,14 +119,14 @@ ofw_copyin(const void *src, vm_offset_t dest, const size_t len) } bcopy(src, (void *)dest, len); - return(len); + return (len); } ssize_t ofw_copyout(const vm_offset_t src, void *dest, const size_t len) { bcopy((void *)src, dest, len); - return(len); + return (len); } ssize_t @@ -143,7 +143,7 @@ ofw_readin(readin_handle_t fd, vm_offset_t dest, const size_t len) buf = malloc(chunk); if (buf == NULL) { printf("ofw_readin: buf malloc failed\n"); - return(0); + return (0); } if (ofw_mapmem(dest, len)) { @@ -166,5 +166,5 @@ ofw_readin(readin_handle_t fd, vm_offset_t dest, const size_t len) } free(buf); - return(len - resid); + return (len - resid); } diff --git a/stand/libofw/ofw_module.c b/stand/libofw/ofw_module.c index 8d56f6debbb6..4c1fe9cd279d 100644 --- a/stand/libofw/ofw_module.c +++ b/stand/libofw/ofw_module.c @@ -42,5 +42,5 @@ int ofw_autoload(void) { /* XXX Call some machdep autoload routine? */ - return(0); + return (0); } diff --git a/stand/libofw/ofw_net.c b/stand/libofw/ofw_net.c index b4bcb7a00fe2..3418216a9836 100644 --- a/stand/libofw/ofw_net.c +++ b/stand/libofw/ofw_net.c @@ -80,13 +80,13 @@ static void *dmabuf; static int ofwn_match(struct netif *nif, void *machdep_hint) { - return 1; + return (1); } static int ofwn_probe(struct netif *nif, void *machdep_hint) { - return 0; + return (0); } static ssize_t @@ -123,7 +123,7 @@ ofwn_put(struct iodesc *desc, void *pkt, size_t len) printf("netif_put: OF_write returned %d\n", rv); #endif - return rv; + return (rv); } static ssize_t @@ -256,13 +256,13 @@ ofwn_getunit(const char *path) for (i = 0; i < nofwninfo; i++) { printf(">>> test =\t%s\n", ofwninfo[i].ofwn_path); if (strcmp(path, ofwninfo[i].ofwn_path) == 0) - return i; + return (i); if (strcmp(newpath, ofwninfo[i].ofwn_path) == 0) - return i; + return (i); } - return -1; + return (-1); } #endif diff --git a/stand/libofw/ofw_time.c b/stand/libofw/ofw_time.c index c2da603bb52e..48372428ae29 100644 --- a/stand/libofw/ofw_time.c +++ b/stand/libofw/ofw_time.c @@ -35,7 +35,7 @@ time(time_t *tloc) secs = OF_milliseconds() / 1000; if (tloc) *tloc = secs; - return secs; + return (secs); } time_t @@ -43,7 +43,7 @@ getsecs(void) { time_t n = 0; time(&n); - return n; + return (n); } void