From nobody Mon Apr 10 22:51:19 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 4PwPN72Q7Fz44v9F; Mon, 10 Apr 2023 22:51:19 +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 4PwPN71snGz4lMg; Mon, 10 Apr 2023 22:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681167079; 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=4casdZOEZwouAqN1Vr1hLbI7UCxVE5aSIBjipzm0EpI=; b=l/BiEqDmt1sr4xbV+pIgGRVlbwaRnGUtVvxcNy+0uI1hvScYWiRFERylEWbI2HKhDhs+xh b8xbtkZjOtvKqRTa7sZrdWWVg3jP+tzya2in1dY1cmiFag03E9Yb/XKWDbXT8HESXHAlrY zuGfd00x1M+UYiUJfGxr0+gdJkBZ6y7Doh8YOry5A41KVXvbCd1gyzOaAMGHnKAmtAuOFz 9CF6B+qayhJj61BcPIIZBaT+IGRlASxk0Hv7muYAzM2OAZFOw46PEaYMF7+cVEz7XBNoJR 1DclWoLEQ9fK1t85ienA/j/xXvx9GB/247Mwyrfkxjim6kMgELBuT903e5X3FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681167079; 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=4casdZOEZwouAqN1Vr1hLbI7UCxVE5aSIBjipzm0EpI=; b=Xx/6G1wCPuvsINhnXhtYxuHIWFRD5yqKKUGpYd0uO4EU5yomv1AatglosfS0rImaVWikAo o/06Q25DziZw4RGglFkQ4teTceVdT8iPlMWHPYzhsuiDJ74g4B9Zu/I7VagaQbs1o2yFDr GSQthjW9tq79krzSwuApfWaiaT7205VJlwmjtpc6j5azSxxj0HGqDtxLtX8cIuAaxyDX69 vhksS0icfT18Q8uo1N9pmXXyKDpsIwciX2yQQ1FXgzWsGT/Bl9bd3SJSmgTDSUvH2Kn3rt fgUJCdXy4JuriPAaILtYdiFoPIdBTFQVR9JXApfd+KRed70RmI3UXQm0x5Dt7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681167079; a=rsa-sha256; cv=none; b=x9jTym+AHYpENRjIx8nqE53dGN1VnpIEokkAioCQ0H3DkgLGP5gYplJuBxxksCQiJ2v+Tl vpavQkcGNIzFt1vcLdSJULhklrXSQ79FrYdpTEWTE1wQF4PXUE0w+2OleGmxZH594Q/Tjy 5RifJfUPmdmoreMJujB8JMMEhp4rNwwZMaH0FfdCjbjBz3OMX30jd9PAXjJwgk7rQylosY Y+sAkf+GIxHbwYkxos2RiOXgGFVQVmBB3TyUILOxu0SwdiqhifcSPJOTbkI51jTM3OS+oc IbAZ4bV0+uUx0YGYqIUfqdyICUxcoMkwy5IsSDJW9XVRrDaBA8Duo7bLL7VPew== 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 4PwPN70zPcz188T; Mon, 10 Apr 2023 22:51:19 +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 33AMpJ31076231; Mon, 10 Apr 2023 22:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AMpJXF076230; Mon, 10 Apr 2023 22:51:19 GMT (envelope-from git) Date: Mon, 10 Apr 2023 22:51:19 GMT Message-Id: <202304102251.33AMpJXF076230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1d1ffa2efd2a - main - makefs: use size_t or ssize_t where appropriate 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d1ffa2efd2a54c435b7977dc1cfd21dce248671 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1d1ffa2efd2a54c435b7977dc1cfd21dce248671 commit 1d1ffa2efd2a54c435b7977dc1cfd21dce248671 Author: Ed Maste AuthorDate: 2023-03-30 02:04:16 +0000 Commit: Ed Maste CommitDate: 2023-04-10 22:50:27 +0000 makefs: use size_t or ssize_t where appropriate Obtained from: NetBSD af7bc97830ac --- usr.sbin/makefs/cd9660.c | 11 ++++++----- usr.sbin/makefs/cd9660.h | 4 ++-- usr.sbin/makefs/cd9660/cd9660_strings.c | 4 ++-- usr.sbin/makefs/ffs/buf.c | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 54c1794d1500..661eefc832da 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660.c,v 1.32 2011/08/23 17:09:11 christos Exp $ */ +/* $NetBSD: cd9660.c,v 1.56 2019/10/18 04:09:02 msaitoh Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause @@ -115,7 +115,7 @@ __FBSDID("$FreeBSD$"); static void cd9660_finalize_PVD(iso9660_disk *); static cd9660node *cd9660_allocate_cd9660node(void); static void cd9660_set_defaults(iso9660_disk *); -static int cd9660_arguments_set_string(const char *, const char *, int, +static int cd9660_arguments_set_string(const char *, const char *, size_t, char, char *); static void cd9660_populate_iso_dir_record( struct _iso_directory_record_cd9660 *, u_char, u_char, u_char, @@ -324,10 +324,11 @@ cd9660_cleanup_opts(fsinfo_t *fsopts) } static int -cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length, - char testmode, char * dest) +cd9660_arguments_set_string(const char *val, const char *fieldtitle, + size_t length, char testmode, char *dest) { - int len, test; + size_t len; + int test; if (val == NULL) warnx("error: '%s' requires a string argument", fieldtitle); diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index c4baa590101a..fae2d2077c00 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660.h,v 1.17 2011/06/23 02:35:56 enami Exp $ */ +/* $NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD @@ -284,7 +284,7 @@ typedef struct _iso9660_disk { /************ FUNCTIONS **************/ int cd9660_valid_a_chars(const char *); int cd9660_valid_d_chars(const char *); -void cd9660_uppercase_characters(char *, int); +void cd9660_uppercase_characters(char *, size_t); /* ISO Data Types */ void cd9660_721(uint16_t, unsigned char *); diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c index 12d7566e463d..da47084961bb 100644 --- a/usr.sbin/makefs/cd9660/cd9660_strings.c +++ b/usr.sbin/makefs/cd9660/cd9660_strings.c @@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$"); void -cd9660_uppercase_characters(char *str, int len) +cd9660_uppercase_characters(char *str, size_t len) { - int p; + size_t p; for (p = 0; p < len; p++) { if (islower((unsigned char)str[p]) ) diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c index 13f3099c4491..f2e2b9a882eb 100644 --- a/usr.sbin/makefs/ffs/buf.c +++ b/usr.sbin/makefs/ffs/buf.c @@ -78,7 +78,7 @@ bread(struct m_vnode *vp, daddr_t blkno, int size, struct ucred *u1 __unused, if (lseek((*bpp)->b_fs->fd, offset, SEEK_SET) == -1) err(1, "%s: lseek %lld (%lld)", __func__, (long long)(*bpp)->b_blkno, (long long)offset); - rv = read((*bpp)->b_fs->fd, (*bpp)->b_data, (*bpp)->b_bcount); + rv = read((*bpp)->b_fs->fd, (*bpp)->b_data, (size_t)(*bpp)->b_bcount); if (debug & DEBUG_BUF_BREAD) printf("%s: read %ld (%lld) returned %d\n", __func__, (*bpp)->b_bcount, (long long)offset, (int)rv); @@ -206,8 +206,8 @@ getblk(struct m_vnode *vp, daddr_t blkno, int size, int u1 __unused, } bp->b_bcount = size; if (bp->b_data == NULL || bp->b_bcount > bp->b_bufsize) { - n = erealloc(bp->b_data, size); - memset(n, 0, size); + n = erealloc(bp->b_data, (size_t)size); + memset(n, 0, (size_t)size); bp->b_data = n; bp->b_bufsize = size; }