From nobody Wed Feb 09 06:28:35 2022 X-Original-To: dev-commits-src-branches@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 4E8FD19C3EE1; Wed, 9 Feb 2022 06:28:36 +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 4JtqhM41Hlz4yv8; Wed, 9 Feb 2022 06:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644388115; 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=W0hI6uCK4uUgm6QUYlSeMmA2cNXQD9sGBlo1lAMZg3A=; b=O67yAIsxV9TOInpi/kGH7iVBiiXRtIgs8DDsMldkdfbtvtj20IB3xESkyjaGwHITK9NLuM QCswOI3F2qbTJs5KOxkFCKb4JX0zKFLhN3hkKMiswAsjM24vTSoLxpXF2nnxqnNPx2WCPt 7vxr5smH+trJCAFJBrsZBsOmDe0RLOYsZo/O+AVOcEu6U/cECJLmlRB7FPPVueJjAn9lwE Yci4hwcb02pejLppxEbwuPUAUxdnYeNwzhkkIibbndUe0iEnks0G0cBEieZbBjHC1kisaa 7LqIKkxivO300wICD29EE19tgnVfYvOvNwQOPCIc6fO7QeDswA23HeER35OKvg== 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 333CB3AE; Wed, 9 Feb 2022 06:28:35 +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 2196SZbL038218; Wed, 9 Feb 2022 06:28:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2196SZ8e038217; Wed, 9 Feb 2022 06:28:35 GMT (envelope-from git) Date: Wed, 9 Feb 2022 06:28:35 GMT Message-Id: <202202090628.2196SZ8e038217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2a4a8a1418c9 - stable/12 - makefs(8): Fix a few typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2a4a8a1418c91dd4e071306e9481987e0d4af76e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644388115; 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=W0hI6uCK4uUgm6QUYlSeMmA2cNXQD9sGBlo1lAMZg3A=; b=ja4TifANhWb0ZMOI+IzAh4UziPSNSbcKjy0ks8PmJNJRWYsT24HXOVI1qNMaFd43Wk75RX IR/nbBtcTjUp0p+xn+Va9lLadZ4rL7vW2nr/bRbSwsPeB1hIIzSJI6bAXLxOPP/Tcffdd9 /iqlDo8gCzdA+ExMXzWhWm9cg3blHO1hdJY6aIw954NUnTUPgfJqapJ6mpmcgV5INAHzlf 2DChXN/v9npc05NJjDbtWcbrYBdPbCXLGLWvYNNBLdggtSdraHQBvF1tylNeDzwJ5ntrlR qQDWs9PMspy58/YS+W/QaYQ1H8nfxIZ5L4SIZvKnHw9X8O867MGzkGc49LvYEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644388115; a=rsa-sha256; cv=none; b=b79moEW8tMWrnHNzYKV3QGic+gl3XNCPN4aV8sZnMQmYV/Omp16JNlthfWd+bAxE8jpDsF 8JroLVXTfmWZWEyfAK73LwOFA/pq7H1T7dapGDdYjiKaUuICLbIG2hjc9AbVHx7CxFgdjd iP32IaXjj/etwCOU0IJHPdGhBG1xUTEDVfP++QpF0F8W0mH56l4r/rtJApU1+OeG/xySze HQuDuS1HrfR4qdh4zlK6D8w9VsRwS/Un51hfYMRHKx8sUS8h6sx+rhCPR6Sj1eVPqRUviE o7aqL6gt1C6Td8Huj+lY6Tg+9ZtRKtSHWkDqSu3dQXti9vU4zGT6aTJWcv1lmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=2a4a8a1418c91dd4e071306e9481987e0d4af76e commit 2a4a8a1418c91dd4e071306e9481987e0d4af76e Author: Gordon Bergling AuthorDate: 2022-02-06 12:46:38 +0000 Commit: Gordon Bergling CommitDate: 2022-02-09 06:26:31 +0000 makefs(8): Fix a few typos in source code comments - s/concearned/concerned/ - s/quadradically/quadratically/ Obtained from: NetBSD (cherry picked from commit 164fa411b9244ce3f4ae0d6f17a7f64f6b9ee941) --- usr.sbin/makefs/cd9660/cd9660_write.c | 2 +- usr.sbin/makefs/ffs/ffs_alloc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index 8d4df08275db..e9de902c24f4 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -97,7 +97,7 @@ cd9660_write_image(iso9660_disk *diskStructure, const char* image) /* * Write the path tables: there are actually four, but right - * now we are only concearned with two. + * now we are only concerned with two. */ status = cd9660_write_path_tables(diskStructure, fd); if (status == 0) { diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c index 88d95d6e5dda..b5fbb4111685 100644 --- a/usr.sbin/makefs/ffs/ffs_alloc.c +++ b/usr.sbin/makefs/ffs/ffs_alloc.c @@ -80,13 +80,13 @@ static int32_t ffs_mapsearch(struct fs *, struct cg *, daddr_t, int); * 1) allocate the requested block. * 2) allocate a rotationally optimal block in the same cylinder. * 3) allocate a block in the same cylinder group. - * 4) quadradically rehash into other cylinder groups, until an + * 4) quadratically rehash into other cylinder groups, until an * available block is located. * If no block preference is given the following hierarchy is used * to allocate a block: * 1) allocate a block in the cylinder group that contains the * inode for the file. - * 2) quadradically rehash into other cylinder groups, until an + * 2) quadratically rehash into other cylinder groups, until an * available block is located. */ int @@ -235,7 +235,7 @@ ffs_blkpref_ufs2(struct inode *ip, daddr_t lbn, int indx, int64_t *bap) * * The policy implemented by this algorithm is: * 1) allocate the block in its requested cylinder group. - * 2) quadradically rehash on the cylinder group number. + * 2) quadratically rehash on the cylinder group number. * 3) brute force search for a free block. * * `size': size for data blocks, mode for inodes