From nobody Fri May 3 15:03:52 2024 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 4VWDbD6npGz5K9J9; Fri, 3 May 2024 15:03:52 +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 4VWDbD6KTLz50V3; Fri, 3 May 2024 15:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714748632; 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=iFaYB2TvVMqKDW3JVipWylE2YNiG804QZbmKcmdvwCA=; b=DomhXWXO8uPPV556H0CpWX8O5kLkXHlDagBjMa3jxfhRJmqeQLx4arGuEZ9XTbim9aeXEP 7kPaVXlOl9CXtw+Hq0avuX6rslQzIIA6Hv2OFKktQQH2lN2UiaDy2Vyw5GFmhGN3I13f/d +DKT3uaFwv9+q55bzgyrm/vDTfjvSwD/mlsfyswKSpiYDMYcEJUmM55TXXi9hwUvRFZnpO 0nqZO/XeT960rpPYECGiIShdOCQkI9Zq6v4gea4kAU2u81r7qAK2HlPg+4PmWTIykNSPXc a9hjVoBPZX0YnopkXL/fUOGauVVgBi9JBJRwdReXQaObehJ5ygTQuIrw/mnkcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714748632; a=rsa-sha256; cv=none; b=XE25dC97XLkI+EdLqRytAzce8mpWp7ikEOoyaAkRO1z6nzHbFBJfbr0dWxZgG5oaxBHuiP 1WUAqQdj+MWWOeVlnsK40NrdMgmZaNvpBvwMTZdi6A/IDPGvHtdeLxO7QzyoHIWVRNHBcG joG5lt0B04WxWK+YeaD1VowiTgA5HX1VPZd65c2VqaDtZEuZYG8chYWwVEqHtCrSg7f+cE srd+iiKB2wcnSc2DvENJo9rK6AJWsiU3RNe0hns5KBHiQM4vB83+iE2uslYvPWh8Gm1dNJ uuwJVmM9/uA05h9AfFLPOVI5kZ6QeO44EG+8MWgE4SXh4R8Oce+pRXNfgVXW8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714748632; 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=iFaYB2TvVMqKDW3JVipWylE2YNiG804QZbmKcmdvwCA=; b=O/4Gpsm6irYhGfJJBjwxZAt05T+Xxj3O723c/lqoSOsF0nDOPuNs+620ZwWai1uYqBc926 bi2iPngxkG81q5Ns/Xx9xwTwyRFjW2dlbrD9Jeopb7sHzE/s4Eq7/4crSHelp/Alp+wDNc z09byOhVs3htGbMgsNpudNVR6ulwdeyEPYQxZR+gzUMxSmo30cSCjcogshQJYf9KS42cpx e26Ac/TBtlmID+4dciUGfUc63wI+5jMKQjZNgxk7iCtyMFGgyBY+plrK0nscLmAlp7k/6i DzlAn/MKnoYA6CP3o/x4rh0qPoUCEjo7VpRvPrJP+CANpnsx74ZnGZw0aiE9Jw== 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 4VWDbD5xnjzqfh; Fri, 3 May 2024 15:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 443F3q9A086115; Fri, 3 May 2024 15:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443F3qir086112; Fri, 3 May 2024 15:03:52 GMT (envelope-from git) Date: Fri, 3 May 2024 15:03:52 GMT Message-Id: <202405031503.443F3qir086112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0549218b43f0 - main - libdiff: Fix type issues. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0549218b43f028bb5bde430d7fcc6ead6843aa61 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0549218b43f028bb5bde430d7fcc6ead6843aa61 commit 0549218b43f028bb5bde430d7fcc6ead6843aa61 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-03 15:03:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-03 15:03:50 +0000 libdiff: Fix type issues. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D45077 --- contrib/libdiff/lib/diff_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/libdiff/lib/diff_main.c b/contrib/libdiff/lib/diff_main.c index e64b1320e553..1cf91c0a1bdb 100644 --- a/contrib/libdiff/lib/diff_main.c +++ b/contrib/libdiff/lib/diff_main.c @@ -54,7 +54,8 @@ diff_chunk_type(const struct diff_chunk *chunk) static int read_at(FILE *f, off_t at_pos, unsigned char *buf, size_t len) { - int r; + ssize_t r; + if (fseeko(f, at_pos, SEEK_SET) == -1) return errno; r = fread(buf, sizeof(char), len, f); @@ -153,7 +154,7 @@ diff_atom_cmp(int *cmp, unsigned char buf_left[chunksz], buf_right[chunksz]; const uint8_t *p_left, *p_right; off_t n_left, n_right; - ssize_t r; + int r; if (!remain_right) { *cmp = 1;