 @@ -19,27 +19,27 @@
  * 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 <machine/asm.h>
-RCSID("$NetBSD: strcpy_arm.S,v 1.6 2017/01/14 03:35:21 christos Exp $")
+RCSID("$NetBSD: strcpy_arm.S,v 1.7 2024/02/08 20:51:24 andvar Exp $")
 #ifdef STRLCPY
 #ifdef _LIBC
 WEAK_ALIAS(strlcpy, _strlcpy)
 #  define	FUNCNAME	_strlcpy
 # else
 #  define	FUNCNAME	strlcpy
 # endif
 #elif defined(STRNCPY)
 # ifdef _LIBC
 WEAK_ALIAS(strncpy, _strncpy)
 #  define	FUNCNAME	_strncpy
 # else
 @@ -238,29 +238,29 @@ ENTRY(FUNCNAME)
 	uqadd8	r3, r5, r7		/* NUL detection magic happens */
 	mvns	r3, r3			/* is the complemented result 0? */
 	beq	.Lincongruent_mainloop_load /*   yes, no NUL encountered! */
 #ifdef __ARMEL__
 	rev	r3, r3			/* CLZ wants BE input */
 #endif
 	clz	r3, r3			/* count leading zeros */
 #else
 	/*
 	 * We already tested for byte 0 above so we don't need to it again.
 	 */
 	mov	r3, #24			/* assume NUL is in byte 3 */
 	tst	r5, #BYTE1		/* did we find a NUL in byte 1? */
-	subeq	r3, r3, #8		/*   yes, decremnt byte position */
+	subeq	r3, r3, #8		/*   yes, decrement byte position */
 	tstne	r5, #BYTE2		/*   no, did we find a NUL in byte 2? */
-	subeq	r3, r3, #8		/*   yes, decremnt byte position */
+	subeq	r3, r3, #8		/*   yes, decrement byte position */
 	tstne	r5, #BYTE3		/*   no, did we find a NUL in byte 3? */
 	bne	.Lincongruent_mainloop_load /*   no, no NUL encountered! */
 #endif
 	mov	r5, r4			/* discard already dealt with bytes */
 .Lincongruent_end_of_string:
 #if defined(STRLCPY)
 	add	r1, r1, r3, lsr #3	/* then add offset to NUL */
 #endif
 	sub	r3, r3, r9		/* adjust NUL offset */
 	b	.Llast_bytes		/* NUL encountered! finish up */
 #if defined(STRLCPY) || defined(STRNCPY)
 .Lincongruent_no_more_room:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: blkdiscard.c,v 1.3 2024/01/25 02:42:17 mrg Exp $	*/
+/*	$NetBSD: blkdiscard.c,v 1.4 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright (c) 2019, 2020, 2022, 2024 Matthew R. Green
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -145,27 +145,27 @@ main(int argc, char *argv[])
 		case 'z':
 			zeroout = true;
 			break;
 		case 'h':
 			usage(NULL);
 		default:
 			usage("bad options\n");
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (secure)
-		usage("blkdiscard: secure erase not yet implemnted\n");
+		usage("blkdiscard: secure erase not yet implemented\n");
 	if (zeroout) {
 		zeros = calloc(1, max_per_call);
 		if (!zeros)
 			errx(1, "Unable to allocate %lld bytes for zeros",
 			    (long long)max_per_call);
+	}
 	if (length)
 		end_offset = first_byte + length;
 	if (argc != 1)
 		usage("not one arg left\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: psl.h,v 1.22 2021/03/06 08:08:19 rin Exp $	*/
+/*	$NetBSD: psl.h,v 1.23 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -64,27 +64,27 @@
 #define	PSL_FE1		0x00000100	/* B.6. floating point mode 1 */
 #define	PSL_IP		0x00000040	/* ..6. interrupt prefix */
 #define	PSL_IR		0x00000020	/* .468 instruction address relocation */
 #define	PSL_IS		PSL_IR		/* B... instruction address space */
 #define	PSL_DR		0x00000010	/* .468 data address relocation */
 #define	PSL_DS		PSL_DR		/* B... data address space */
 #define	PSL_PM		0x00000008	/* ..6. Performance monitor */
 #define	PSL_PMM		PSL_PM		/* B... Performance monitor */
 #define	PSL_RI		0x00000002	/* ..6. recoverable interrupt */
 #define	PSL_LE		0x00000001	/* ..6. endian mode (1 == le) */
 #define	PSL_601_MASK	~(PSL_VEC|PSL_POW|PSL_ILE|PSL_BE|PSL_RI|PSL_LE)
-/* The IBM 970 series does not implemnt LE mode */
+/* The IBM 970 series does not implement LE mode */
 #define PSL_970_MASK	~(PSL_ILE|PSL_LE)
 /*
  * Floating-point exception modes:
  */
 #define	PSL_FE_DIS	0		/* none */
 #define	PSL_FE_NONREC	PSL_FE1		/* imprecise non-recoverable */
 #define	PSL_FE_REC	PSL_FE0		/* imprecise recoverable */
 #define	PSL_FE_PREC	(PSL_FE0 | PSL_FE1) /* precise */
 #define	PSL_FE_DFLT	PSL_FE_DIS	/* default == none */
 /*
  * Note that PSL_POW and PSL_ILE are not in the saved copy of the MSR

 @@ -1,41 +1,41 @@
-/*	$NetBSD: mvxpbm.c,v 1.3 2021/12/05 03:04:41 msaitoh Exp $	*/
+/*	$NetBSD: mvxpbm.c,v 1.4 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: mvxpbm.c,v 1.3 2021/12/05 03:04:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvxpbm.c,v 1.4 2024/02/08 20:51:24 andvar Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <dev/marvell/marvellreg.h>
 #include <dev/marvell/marvellvar.h>
 #include "mvxpbmvar.h"
 @@ -176,27 +176,27 @@ mvxpbm_alloc_buffer(struct mvxpbm_softc
 	int error;
 	/*
 	 * set default buffer sizes. this will changed to satisfy
 	 * alignment restrictions.
 	 */
 	sc->sc_chunk_count = 0;
 	sc->sc_chunk_size = MVXPBM_PACKET_SIZE;
 	sc->sc_chunk_header_size = sizeof(struct mvxpbm_chunk);
 	sc->sc_chunk_packet_offset = 64;
 	/*
 	 * adjust bm_chunk_size, bm_chunk_header_size, bm_slotsize
-	 * to satisfy alignemnt restrictions.
+	 * to satisfy alignment restrictions.
+	 *
 	 *    <----------------  bm_slotsize [oct.] ------------------>
 	 *                               <--- bm_chunk_size[oct.] ---->
 	 *    <--- header_size[oct] ---> <-- MBXPE_BM_SIZE[oct.] --->
 	 *   +-----------------+--------+---------+-----------------+--+
 	 *   | bm_chunk hdr    |pad     |pkt_off  |   packet data   |  |
 	 *   +-----------------+--------+---------+-----------------+--+
 	 *   ^                          ^         ^                    ^
 	 *   |                          |         |                    |
 	 *   ptr                 ptr_data  DMA here         ptr_next
+	 *
 	 * Restrictions:
 	 *   - total buffer size must be multiple of MVXPBM_BUF_ALIGN

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cs4280.c,v 1.76 2023/12/20 05:08:34 thorpej Exp $	*/
+/*	$NetBSD: cs4280.c,v 1.77 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright (c) 1999, 2000 Tatoku Ogaito.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -42,27 +42,27 @@
  *	 wss* at pnpbios?
  * or
  *       sb* at pnpbios?
  * Since I could not find any documents on handling ISA codec,
  * clcs does not support those chips.
  */
 /*
  * TODO
  * Joystick support
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.76 2023/12/20 05:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.77 2024/02/08 20:51:24 andvar Exp $");
 #include "midi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/audioio.h>
 #include <sys/bus.h>
 #include <sys/bswap.h>
 @@ -1073,27 +1073,27 @@ cs4280_set_adc_rate(struct cs428x_softc
 	tmp1 = BA1READ4(sc, CS4280_CGC) & ~CGC_MASK;
 	tmp1 |= cgl;
 	BA1WRITE4(sc, CS4280_CGC, tmp1);
+}
 static void
 cs4280_set_dac_rate(struct cs428x_softc *sc, int rate)
+{
 	/*
 	 * playback rate may range from 8000Hz to 48000Hz
+	 *
 	 * play_phase_increment = floor(rate*65536*1024/48000)
-	 * px = round(rate*65536*1024 - play_phase_incremnt*48000)
+	 * px = round(rate*65536*1024 - play_phase_increment*48000)
 	 * py=floor(px/200)
 	 * play_sample_rate_correction = px - 200*py
+	 *
 	 * play_phase_increment is a 32bit signed quantity.
 	 * play_sample_rate_correction is a 16bit signed quantity.
 	 */
 	int32_t ppi;
 	int16_t psrc;
 	uint32_t px, py;
 	if (rate < 8000)
 		rate = 8000;
 	if (rate > 48000)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cs4280reg.h,v 1.8 2019/05/08 13:40:18 isaki Exp $	*/
+/*	$NetBSD: cs4280reg.h,v 1.9 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright (c) 1999, 2000 Tatoku Ogaito.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -182,27 +182,27 @@
 #define CS4280_CDTC	  0x0100	/* Capture DMA Transaction Count */
 #define CS4280_CIE	  0x0104	/* Capture Interrupt Enable */
 #define	 CIE_CI_ENABLE	  0x00000001	/* Capture Interrupt enabled */
 #define	 CIE_CI_DISABLE	  0x00000011	/* Capture Interrupt disabled */
 #define	 CIE_CI_MASK	  0x0000003f
 #define CS4280_CBA	  0x010c	/* Capture Buffer Address */
 #define CS4280_CSRC	  0x02c8	/* Capture Sample Rate Correction */
 #define	 CSRC_MASK	  0xffff0000
 #define	 CS4280_MK_CSRC(csrc, cy) ((((csrc) << 16) & 0xffff0000) | ((cy) & 0xffff))
 #define CS4280_CCI	  0x02d8	/* Capture Coefficient Increment */
 #define	 CCI_MASK	  0xffff0000
 #define CS4280_CD	  0x02e0	/* Capture Delay */
 #define	 CD_MASK	  0xfffc000
-#define CS4280_CPI	  0x02f4	/* Capture Phase Incremnt */
+#define CS4280_CPI	  0x02f4	/* Capture Phase Increment */
 #define CS4280_CGL	  0x0134	/* Capture Group Length */
 #define	 CGL_MASK	  0x0000ffff
 #define CS4280_CNT	  0x0340	/* Capture Number of Triplets */
 #define CS4280_CGC	  0x0138	/* Capture Group Count */
 #define	 CGC_MASK	  0x0000ffff
 #define CS4280_CVOL	  0x02f8	/* Capture Volume */
 /* Processor Registers */
 #define CS4280_SPCR	  0x30000	/* Processor Control Register */
 #define	 SPCR_RUN	  0x00000001
 #define	 SPCR_STPFR	  0x00000002
 #define	 SPCR_RUNFR	  0x00000004
 #define	 SPCR_DRQEN	  0x00000020

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs_clrpcops.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $	*/
+/*	$NetBSD: nfs_clrpcops.c,v 1.3 2024/02/08 20:51:25 andvar Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -24,27 +24,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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>
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clrpcops.c 298788 2016-04-29 16:07:25Z pfg "); */
-__RCSID("$NetBSD: nfs_clrpcops.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clrpcops.c,v 1.3 2024/02/08 20:51:25 andvar Exp $");
 /*
  * Rpc op calls, generally called from the vnode op calls or through the
  * buffer cache, for NFS v2, 3 and 4.
  * These do not normally make any changes to vnode arguments or use
  * structures that might change between the VFS variants. The returned
  * arguments are all at the end, after the NFSPROC_T *p one.
  */
 #ifndef APPLEKEXT
 #ifdef _KERNEL_OPT
 #include "opt_inet6.h"
 #endif
 @@ -1012,27 +1012,27 @@ nfsrpc_getattr(vnode_t vp, struct ucred
+	}
 	error = nfscl_request(nd, vp, p, cred, stuff);
 	if (error)
 		return (error);
 	if (!nd->nd_repstat)
 		error = nfsm_loadattr(nd, nap);
 	else
 		error = nd->nd_repstat;
 	mbuf_freem(nd->nd_mrep);
 	return (error);
+}
 /*
- * nfs getattr call with non-vnode arguemnts.
+ * nfs getattr call with non-vnode arguments.
  */
 APPLESTATIC int
 nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred,
     struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, u_int64_t *xidp,
     uint32_t *leasep)
+{
 	struct nfsrv_descript nfsd, *nd = &nfsd;
 	int error, vers = NFS_VER2;
 	nfsattrbit_t attrbits;
 	nfscl_reqstart(nd, NFSPROC_GETATTR, nmp, fhp, fhlen, NULL, NULL);
 	if (nd->nd_flag & ND_NFSV4) {
 		vers = NFS_VER4;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse_v2.c,v 1.6 2021/10/12 19:08:04 christos Exp $	*/
+/*	$NetBSD: parse_v2.c,v 1.7 2024/02/08 20:51:25 andvar Exp $	*/
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by James Browning, Gabe Coffland, Alex Gavin, and Solomon Ritzow.
+ *
  * 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>
-__RCSID("$NetBSD: parse_v2.c,v 1.6 2021/10/12 19:08:04 christos Exp $");
+__RCSID("$NetBSD: parse_v2.c,v 1.7 2024/02/08 20:51:25 andvar Exp $");
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <err.h>
 #include "inetd.h"
 #include "ipsec.h"
 @@ -124,27 +124,27 @@ static struct key_handler {
 	{ "exec", exec_handler },
 	{ "args", args_handler },
 	{ "ip_max", ip_max_handler },
 #ifdef IPSEC
 	{ "ipsec", ipsec_handler }
 #endif
 };
 /* Error Not Initialized */
 #define ENI(key) ERR("Required option '%s' not specified", (key))
 #define WAIT_WRN "Option 'wait' for internal service '%s' was inferred"
-/* Too Few Arguemnts (values) */
+/* Too Few Arguments (values) */
 #define TFA(key) ERR("Option '%s' has too few arguments", (key))
 /* Too Many Arguments (values) */
 #define TMA(key) ERR("Option '%s' has too many arguments", (key))
 /* Too Many Definitions */
 #define TMD(key) ERR("Option '%s' is already specified", (key))
 #define VALID_SOCKET_TYPES "stream, dgram, rdm, seqpacket, raw"
 parse_v2_result
 parse_syntax_v2(struct servtab *sep, char **cpp)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: disklabel.c,v 1.51 2023/01/06 15:05:52 martin Exp $	*/
+/*	$NetBSD: disklabel.c,v 1.52 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -69,27 +69,27 @@ static void
 disklabel_init_default_alignment(struct disklabel_disk_partitions *parts,
     uint track)
+{
 	if (track == 0)
 		track = MEG / parts->dp.bytes_per_sector;
 	if (dl_maxpart == 0)
 		dl_maxpart = getmaxpartitions();
 #ifdef MD_DISKLABEL_SET_ALIGN_PRE
 	if (MD_DISKLABEL_SET_ALIGN_PRE(parts->ptn_alignment, track))
 		return;
 #endif
-	/* Use 1MB alignemnt for large (>128GB) disks */
+	/* Use 1MB alignment for large (>128GB) disks */
 	if (parts->dp.disk_size > HUGE_DISK_SIZE) {
 		parts->ptn_alignment = 2048;
 	} else if (parts->dp.disk_size > TINY_DISK_SIZE ||
 	    parts->dp.bytes_per_sector > 512) {
 		parts->ptn_alignment = 64;
 	} else {
 		parts->ptn_alignment = 1;
+	}
 #ifdef MD_DISKLABEL_SET_ALIGN_POST
 	MD_DISKLABEL_SET_ALIGN_POST(parts->ptn_alignment, track);
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gpt.c,v 1.30 2022/12/15 14:54:27 martin Exp $	*/
+/*	$NetBSD: gpt.c,v 1.31 2024/02/08 20:51:24 andvar Exp $	*/
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -1005,27 +1005,27 @@ gpt_create_unknown_part_type(void)
 		return NULL;
 	return gpt_get_uuid_part_type(&id);
+}
 static daddr_t
 gpt_get_part_alignment(const struct disk_partitions *parts)
+{
 	assert(parts->disk_size > 0);
 	if (parts->disk_size < 0)
 		return 1;
-	/* Use 1MB offset/alignemnt for large (>128GB) disks */
+	/* Use 1MB offset/alignment for large (>128GB) disks */
 	if (parts->disk_size > HUGE_DISK_SIZE)
 		return 2048;
 	else if (parts->disk_size > TINY_DISK_SIZE)
 		return 64;
 	else
 		return 4;
+}
 static bool
 gpt_can_add_partition(const struct disk_partitions *arg)
+{
 	const struct gpt_disk_partitions *parts =
 	    (const struct gpt_disk_partitions*)arg;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbr.c,v 1.46 2022/07/10 12:49:05 martin Exp $ */
+/*	$NetBSD: mbr.c,v 1.47 2024/02/08 20:51:24 andvar Exp $ */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -881,27 +881,27 @@ mbr_sort_main_mbr(struct mbr_sector *m)
 static void
 mbr_init_default_alignments(struct mbr_disk_partitions *parts, uint track)
+{
 	if (track == 0)
 		track = 16065;
 	assert(parts->dp.disk_size > 0);
 	if (parts->dp.disk_size < 0)
 		return;
 	parts->ptn_0_offset = parts->geo_sec;
-	/* Use 1MB offset/alignemnt for large (>128GB) disks */
+	/* Use 1MB offset/alignment for large (>128GB) disks */
 	if (parts->dp.disk_size > HUGE_DISK_SIZE) {
 		parts->ptn_alignment = 2048;
 	} else if (parts->dp.disk_size > TINY_DISK_SIZE) {
 		parts->ptn_alignment = 64;
 	} else {
 		parts->ptn_alignment = 1;
+	}
 	parts->ext_ptn_alignment = track;
+}
 static struct disk_partitions *
 mbr_create_new(const char *disk, daddr_t start, daddr_t len,
     bool is_boot_drive, struct disk_partitions *parent)

 @@ -1,23 +1,23 @@
-.\"	$Id: 0.t,v 1.1 2001/07/04 05:29:25 itojun Exp $
+.\"	$Id: 0.t,v 1.2 2024/02/08 20:51:24 andvar Exp $
 .\"
 .EQ
 delim $$
 .EN
 .if n .ND
 .TL
 Mbuf issues in 4.4BSD IPv6/IPsec support
 .br
-\(em experiences from KAME IPv6/IPsec implemntation \(em
+\(em experiences from KAME IPv6/IPsec implementation \(em
 .AU
 Jun-ichiro itojun Hagino
 .AI
 KAME Project
 Research Laboratory, Internet Initiative Japan Inc.
 \f[CR]http://www.kame.net/\fP
 .I itojun@iijlab.net
 .AB
 The 4.4BSD network stack has made certain assumptions regarding the packets it will handle.
 In particular, 4.4BSD assumes that
 (1) the total protocol header length is shorter than or equal to MHLEN,
 usually 100 bytes, and
 (2) there are a limited number of protocol headers on a packet.