Wed Sep 8 11:59:43 2021 UTC ()

Restore braces for if/else statements which have logically single line,
but physically multiple lines.

This is recommended by an example in style:
http://cvsweb.netbsd.org/bsdweb.cgi/src/share/misc/style#rev1.58

Thanks tsutsui@ for pointing it out.


(rin)

diff -r1.92 -r1.93 src/sys/arch/sh3/sh3/pmap.c

--- src/sys/arch/sh3/sh3/pmap.c 2021/09/08 07:25:55	1.92
+++ src/sys/arch/sh3/sh3/pmap.c 2021/09/08 11:59:43	1.93

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.92 2021/09/08 07:25:55 rin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.93 2021/09/08 11:59:43 rin Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.92 2021/09/08 07:25:55 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.93 2021/09/08 11:59:43 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/pool.h>
 #include <sys/msgbuf.h>
 #include <sys/socketvar.h>	/* XXX: for sock_loan_thresh */
 #include <uvm/uvm.h>
 #include <uvm/uvm_physseg.h>
 #include <sh3/mmu.h>
 #include <sh3/cache.h>
 @@ -361,34 +361,35 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
+		}
 		/* Check for existing mapping */
 		if (__pmap_map_change(pmap, va, pa, prot, entry))
 			return 0;
 		/* Add to physical-virtual map list of this page */
 		if (__pmap_pv_enter(pmap, pg, va)) {
 			if (flags & PMAP_CANFAIL)
 				return ENOMEM;
 			panic("%s: cannot allocate pv", __func__);
+		}
 	} else {	/* bus-space (always uncached map) */
-		if (kva)
+		if (kva) {
 			entry |= PG_V | PG_SH |
 			    ((prot & VM_PROT_WRITE) ?
 			    (PG_PR_KRW | PG_D) : PG_PR_KRO);
-		else
+		} else {
 			entry |= PG_V |
 			    ((prot & VM_PROT_WRITE) ?
 			    (PG_PR_URW | PG_D) : PG_PR_URO);
+		}
+	}
 	/* Register to page table */
 	if (kva)
 		pte = __pmap_kpte_lookup(va);
 	else {
 		pte = __pmap_pte_alloc(pmap, va);
 		if (pte == NULL) {
 			if (flags & PMAP_CANFAIL) {
 				if (pg != NULL)
 					__pmap_pv_remove(pmap, pg, va);
 				return ENOMEM;
+			}
 @@ -778,29 +779,30 @@ pmap_zero_page(paddr_t phys)
 	} else
 		memset((void *)SH3_PHYS_TO_P1SEG(phys), 0, PAGE_SIZE);
+}
 void
 pmap_copy_page(paddr_t src, paddr_t dst)
+{
 	if (SH_HAS_VIRTUAL_ALIAS) {	/* don't polute cache */
 		/* sync cache since we access via P2. */
 		sh_dcache_wbinv_all();
 		memcpy((void *)SH3_PHYS_TO_P2SEG(dst),
 		    (void *)SH3_PHYS_TO_P2SEG(src), PAGE_SIZE);
-	} else
+	} else {
 		memcpy((void *)SH3_PHYS_TO_P1SEG(dst),
 		    (void *)SH3_PHYS_TO_P1SEG(src), PAGE_SIZE);
+	}
+}
 bool
 pmap_is_referenced(struct vm_page *pg)
+{
 	struct vm_page_md *pvh = VM_PAGE_TO_MD(pg);
 	return (pvh->pvh_flags & PVH_REFERENCED) ? true : false;
+}
 bool
 pmap_clear_reference(struct vm_page *pg)
+{