From nobody Mon Feb 27 23:35:08 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 4PQcL46PWsz3tKj1; Mon, 27 Feb 2023 23:35:08 +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 4PQcL45cdCz3xj0; Mon, 27 Feb 2023 23:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677540908; 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=guVZs2zfVU+7Gt20TC/cS9ml6JNKSkK3vgL+fbKQh7k=; b=eIVUsdRUjjtUmARpaonBT8H+/8HBQAChuvrheXf1wWDW+S4RvrSsfgMVnmi8l7nPo+QfSo BgWFynzmaCW1dxtbd65/gbNYjXPyr8rofTtTwtll3/K4nuog5v3d1SZU9qo52Glgl8UVAF 3cmqGoxnXu3uharXvwKSS9FYEf5v1eovsuozM9myPKHg9QjO91ue744UkchY/3pqeEb2O3 8DTrRjjYTyZtJ/0xoZ3J+rix9iu7GijU2ZSbQFkqKuXfkMfPZS4hlM314y3h1NVKISHOpx 7g1iqniHgCdtK4+C8pteL8GzIPPnhB0hRq5kSYeenq83f3mW+EYvtO2bBbKP3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677540908; 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=guVZs2zfVU+7Gt20TC/cS9ml6JNKSkK3vgL+fbKQh7k=; b=FrPaqVWtWpLuCJMmDTXJRjJ/q5IH1zIzL5FxnBK7cE851VD5OYmLnLDjPePE/UrExKeP3x Ia8rxMMlkNxQpC+duHKp9X0V62rm5qi5rbR6cletIgDjLz8UB3P74XdO1NarNHUsUjXuBx 3kvidyNgpSpfZ+/EE3CHhziqWihZudUdGvQjdW1ZwAs3pKjqAIq05K2die8WKkx8mPDNHE 11jigyCZMgcVTaK++GAlo0LApwF20alGHGeI4yy4s7XCeOQYAFEU8dRpR7lBl0AEKwoiGW +1KXUEVPrkyc+5w7KJojjVKwKXctKZ5NjH90pW8OgsYfbdl4FqCQJKGzeKqDPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677540908; a=rsa-sha256; cv=none; b=JBJZUN/VN8zkQO3d4/fqK+39WAJTKJo+UaFjGv+Ty7ATVVmy87FVCbU7Mo59TZLzd88nUS 9g83eLotg4qfvcyzTRw21qIOnhdFM4ww4IsoDVbs3dLgEE/ZiubKKtntQ7pBDH3PACO/Sa jye0ulm7oIkqZpEBYo36C0hZUhoXakxQwvZJKcxiY8z8LukSpfZoAFPlP/4YNXmCFWt8ud JWFEeC2srlEodLFjhOC1DFaLCMxX4oh0OHSFSSD/97UdvlzJOeYqYE+BsKLGt8xr1zUm/w ezBoVXaLsZrqGSjI2mnlOLmFCwu8FheRlRAaI/+3Zk+QkAlz7+adzRiK/A7C/Q== 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 4PQcL44g42zlDW; Mon, 27 Feb 2023 23:35:08 +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 31RNZ86F060097; Mon, 27 Feb 2023 23:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RNZ8UT060096; Mon, 27 Feb 2023 23:35:08 GMT (envelope-from git) Date: Mon, 27 Feb 2023 23:35:08 GMT Message-Id: <202302272335.31RNZ8UT060096@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: 68160fbd1f1f - main - stand: Minor cleanup 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68160fbd1f1f727173932ae6189ca7b5f7ebe68c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=68160fbd1f1f727173932ae6189ca7b5f7ebe68c commit 68160fbd1f1f727173932ae6189ca7b5f7ebe68c Author: Alfonso AuthorDate: 2023-02-27 23:19:54 +0000 Commit: Warner Losh CommitDate: 2023-02-27 23:26:49 +0000 stand: Minor cleanup Replace a cast '0' for a null pointers with NULL Replace a 'goto loop' with a do-while loop in ufs and ext2fs. Cast cp pointer to uintptr_t to test to see if it's aligned rather than long. [ minor tweaks based on my & hps' review, reworded commit message ] Reviewed by: imp, hps Pull Request: https://github.com/freebsd/freebsd-src/pull/547 --- stand/libsa/ext2fs.c | 26 ++++++++++++++------------ stand/libsa/in_cksum.c | 2 +- stand/libsa/ufs.c | 23 ++++++++++++----------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/stand/libsa/ext2fs.c b/stand/libsa/ext2fs.c index 3e91d9fd516f..043da159f0ee 100644 --- a/stand/libsa/ext2fs.c +++ b/stand/libsa/ext2fs.c @@ -796,10 +796,11 @@ ext2fs_close(struct open_file *f) struct file *fp = (struct file *)f->f_fsdata; int level; - f->f_fsdata = (void *)0; - if (fp == (struct file *)0) + if (fp == NULL) return (0); + f->f_fsdata = NULL; + for (level = 0; level < EXT2_NIADDR; level++) { if (fp->f_blk[level]) free(fp->f_blk[level]); @@ -891,16 +892,17 @@ ext2fs_readdir(struct open_file *f, struct dirent *d) /* * assume that a directory entry will not be split across blocks */ -again: - if (fp->f_seekp >= fp->f_di.di_size) - return (ENOENT); - error = buf_read_file(f, &buf, &buf_size); - if (error) - return (error); - ed = (struct ext2dirent *)buf; - fp->f_seekp += ed->d_reclen; - if (ed->d_ino == (ino_t)0) - goto again; + + do { + if (fp->f_seekp >= fp->f_di.di_size) + return (ENOENT); + error = buf_read_file(f, &buf, &buf_size); + if (error) + return (error); + ed = (struct ext2dirent *)buf; + fp->f_seekp += ed->d_reclen; + } while (ed->d_ino == (ino_t)0); + d->d_type = EXTFTODT(ed->d_type); strncpy(d->d_name, ed->d_name, ed->d_namlen); d->d_name[ed->d_namlen] = '\0'; diff --git a/stand/libsa/in_cksum.c b/stand/libsa/in_cksum.c index 2f8c448fc0eb..590a304271d0 100644 --- a/stand/libsa/in_cksum.c +++ b/stand/libsa/in_cksum.c @@ -61,7 +61,7 @@ in_cksum(void *p, int len) sum += v + *cp++; len--; } - if (((long)cp & 1) == 0) { + if (((uintptr_t)cp & 1) == 0) { while ((len -= 2) >= 0) { sum += *(u_short *)cp; cp += 2; diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 769fe9120ee6..cb4c7ca6453c 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -409,7 +409,7 @@ buf_read_file(struct open_file *f, char **buf_p, size_t *size_p) block_size = sblksize(fs, DIP(fp, di_size), file_block); if (file_block != fp->f_buf_blkno) { - if (fp->f_buf == (char *)0) + if (fp->f_buf == NULL) fp->f_buf = malloc(fs->fs_bsize); rc = block_map(f, file_block, &disk_block); @@ -888,16 +888,17 @@ ufs_readdir(struct open_file *f, struct dirent *d) /* * assume that a directory entry will not be split across blocks */ -again: - if (fp->f_seekp >= DIP(fp, di_size)) - return (ENOENT); - error = buf_read_file(f, &buf, &buf_size); - if (error) - return (error); - dp = (struct direct *)buf; - fp->f_seekp += dp->d_reclen; - if (dp->d_ino == (ino_t)0) - goto again; + + do { + if (fp->f_seekp >= DIP(fp, di_size)) + return (ENOENT); + error = buf_read_file(f, &buf, &buf_size); + if (error) + return (error); + dp = (struct direct *)buf; + fp->f_seekp += dp->d_reclen; + } while (dp->d_ino == (ino_t)0); + d->d_type = dp->d_type; strcpy(d->d_name, dp->d_name); return (0);