From nobody Sun Apr 16 03:51:22 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 4Pzbp23DYxz45jKw; Sun, 16 Apr 2023 03:51:22 +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 4Pzbp22pb3z46F1; Sun, 16 Apr 2023 03:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681617082; 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=BQwLPjT+n2pSbG8pRRuGvxOWmVv4b4eINaqKKUu2e3M=; b=N0TUiBt67hLBc/hd2KMd7bF24eFdZMJFGDMr80q3W/VpNINok10NLxQ32u+931eivuJxQk EtsKvs0YzoXwK96PwbstrcW3Abn+c6sjdBwbSt940HNFVGDpsVHPMHMmbONKL7wz1fE097 hBM5MYPh5dmoXfiF5jNE/Jp/jjdfy+H14V/t8yBV2EteIVaC61bplG5Gcnq08wEhIf0zpm YstSOHLDawlIoN2vpwTGCnGlbdp8eQ5ULJ9DkDLIBzkv8jPOYPj9FHwuQfL1fpVSfWNaeZ o+iIZlpRPolVKkUSiXX3GPzCAlYoVcsSUcx//ibZF5b1aW2zeugzKthIX9AeDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681617082; 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=BQwLPjT+n2pSbG8pRRuGvxOWmVv4b4eINaqKKUu2e3M=; b=T5Suuzfbv40ZavwVsT0dfShZIEPOX//1zIGtXCkHFpNG28Ijmlg54wPMz8jcFvwh9QI695 C3AMolRysQ3z2VDJ1HvGqB/52OOcBHcC2wRacvAs12WJLRL+71i56hTO6TzDttidnLN/3B RwjR48l3zjn/LCRYd3RJrnUQ3tglqhohz1oIHS0a0SKCtiUUsZUWmeAYO/4YdASQMHQx+f Hl3SJxB5iWJiPl8mf/W9/8XWyCAGf4v1e52y/K9YWrMSg4z4KtCkNKJa+XvW2BLu0i/tQ0 gBTlH4NnEbZVe2Xqfhxck0FxtHHXEOqlmRHfagTrVKQi72NV0I7wgjxyKPxogw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681617082; a=rsa-sha256; cv=none; b=FofGnQ1wkBycOoYylarKCQqZeMyIfzqoNvcv2BpdjPvUCDl/1Swfs8uwkn+bsTgVWfG5lI oPL+2+8bf0g25JMnxSJIyH30zuLiLumf00S1dGdvEW9iam6/He2BsUk7jlCp51qtqmwDOX q3cLMjOI6gFzZlbkt5Mp8Q1Jq+8kw6lIzer8riXvotnerMZkgzu+FEF2ukVbDN9wmqr8+t KMoBOBBPH7omIlqmQLhesfDgLzuQf1lP+q4ZA0VSmvH7SjmhV2xQvi+1NfoNi4MGmTan+n qaQJ0QDh+mAvAIwMlnSlvOH3RE7L/Hlb5zKTABgWFDU8sci0WP4dCXE3iTyrbg== 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 4Pzbp21vJRzXwt; Sun, 16 Apr 2023 03:51:22 +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 33G3pMQJ026614; Sun, 16 Apr 2023 03:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G3pM4a026613; Sun, 16 Apr 2023 03:51:22 GMT (envelope-from git) Date: Sun, 16 Apr 2023 03:51:22 GMT Message-Id: <202304160351.33G3pM4a026613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: b1a00c2b1368 - main - Quiet compiler warnings for fget_noref and fdget_noref 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1a00c2b136841b84b8ffdc703a1afeee5d0e268 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=b1a00c2b136841b84b8ffdc703a1afeee5d0e268 commit b1a00c2b136841b84b8ffdc703a1afeee5d0e268 Author: Stephen J. Kiernan AuthorDate: 2023-04-16 03:50:54 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-04-16 03:50:54 +0000 Quiet compiler warnings for fget_noref and fdget_noref Summary: Typecasting both parts of the comparison to u_int quiets compiler warnings about signed/unsigned comparison and takes care of positive and negative numbers for the file descriptor in a single comparison. Obtained from: Juniper Netwowrks, Inc. Reviewers: mjg Subscribers: imp Differential Revision: https://reviews.freebsd.org/D39593 --- sys/sys/filedesc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index ffea8d7e0195..578b84696663 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -303,7 +303,7 @@ fget_noref(struct filedesc *fdp, int fd) FILEDESC_LOCK_ASSERT(fdp); - if (__predict_false((u_int)fd >= fdp->fd_nfiles)) + if (__predict_false((u_int)fd >= (u_int)fdp->fd_nfiles)) return (NULL); return (fdp->fd_ofiles[fd].fde_file); @@ -316,7 +316,7 @@ fdeget_noref(struct filedesc *fdp, int fd) FILEDESC_LOCK_ASSERT(fdp); - if (__predict_false((u_int)fd >= fdp->fd_nfiles)) + if (__predict_false((u_int)fd >= (u_int)fdp->fd_nfiles)) return (NULL); fde = &fdp->fd_ofiles[fd];