From patchwork Wed Feb 12 06:04:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Aguilar X-Patchwork-Id: 13971094 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CA882B9BC for ; Wed, 12 Feb 2025 06:04:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340263; cv=none; b=MOkETAicDHaKPt329+5mXIW4KRMd0lcKIX0E3//p2jjWIeo7rqHo3koRFNx8WCXacjmSpc3D+oh+ysTtwFxFHUzhAr95N8IGSHo/UMMdIox0cwnbyZHBjXSXyQ16FqdU27hA/GkJlfndEfiA6ox57F44UE0df4Ryig4tdGLnUTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340263; c=relaxed/simple; bh=mvvpIQKQZLDYaZGZ9yTcLnMRMD3JCdleA9XiB1f4Chs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Xrt6eBPQf4NG9e9Hq6DJeLiHoypx0SXgTiG5OViBYm7DXJyjrqmLJXpP5tWR/1ooWj1eNejk0B9HUUrBp6xT4jT3F1izKaztEEtw7VAxzZdKLgqh+3sk4RQvVXImJwI0uO16CKnnu49bVGQ5n31Q5n2ue9KZqpHYiVO+noZ7k5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=I/c21jzy; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I/c21jzy" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f4a4fbb35so7428995ad.0 for ; Tue, 11 Feb 2025 22:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739340261; x=1739945061; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BQQRwUIEOndeYcTZat/PjSa8e43oGu1aHp2pJorluDw=; b=I/c21jzyM+E6y4x8fWyaiecgBgKUYaW3eCh0RfoVN6BDDxqrr3sJBv4x30j3MOFJex y/iBROd4UnVg3mGk28+fIdQOUMtSPvTpVhI8d6EgQsHRJPR/njkSEU2eGtEOnxZNCLXS 3iySrCNgun/CDRIC6XqVf+SFXgmc4of2ETod6bgGAY3ZpfhFkIEmjcfNSteE5JyXlnB7 NJhKN1UXsk8GswX7xe+e19ASLYgbwlukvpoZmOP+TsT4l4H1Gx7AXiAQQCo6w0FLBSUw ji2FY0QiHYZbKO/DNs34E106gEcTkiX/ed8c/8Bps/CFF2WvC3CqGtROQEOutnYs3+TF 4GKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739340261; x=1739945061; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BQQRwUIEOndeYcTZat/PjSa8e43oGu1aHp2pJorluDw=; b=DtZysmmMFHpuBPA8FIawnLz0dJ8Pt0u/Lj/D48I+mYrldl+rmad+QseqAH2sJ4DQPa RpCSqV4pjCKuVxQ+Ltr7AxpmM6sgI+n8Mc46U06RahqGEuotQ9d9giCfNxhrx16K0xKf ZgYBoSQkcSRyfnqdtcCVNczpngDFNoa1LKB3gzza+oY+PRcTrgqN1TgQdFKkZi0LGU+B e4Xz7BbXH2Q4G1iHRbQPIObdT5PNfqWR7pWZInfsNDjujru+58Srb3S9ysVSzmaq2NXs qX15SqqUkx2DlCGJ2NZmQRTbesR9vCGVRAEUPEzgghO5JmlZC5whFTSsXzWRuwE35R37 7Ouw== X-Gm-Message-State: AOJu0Yz7P0cYOQVF5qElmfHIAuyAePdjo7yfcnXHmzAtCXt88ROw8khe Mr0dcE79mdurcx/r4W6/uuTsSc0QqTTsIt/HK9LZFykxYv/+r1RxgStkBA== X-Gm-Gg: ASbGncvsD+DcVvGpbOd/WEQlp4DxVCdw77ExSK7ELUlHKTY11/Lu1bl5KCOChU0Uwo5 aEGpwANOMI17EBbiuiEMjmLTm82pnpf6U15W5ZBUAOXp9tmDkVtWTXtlU3nuRXpzbcbJYE7+2x8 dHeHLXVxxXiKQqMQRqiiH4k9uWfuvux2yPnNGQYXzt4gmfSFdgLBACyK48ohwGN9zn+hawW4nEq +oVfcy38nnbSJzyxN/nytLISVrUMTir9uJG1FIDzjuvVPoYV9E4q+4Zi9K4vcwzuENLFa9cSfZL XIzDtOi6pPZckR7wXzd4BR3JKg== X-Google-Smtp-Source: AGHT+IEBRowUOOcw2FUytCSWqvcXdgEYCwO1QwlZjc4BFFKAHdOlPwGXSgQ/mVo/13Me+vu1/eqJXg== X-Received: by 2002:a17:902:f14d:b0:21f:81cf:454a with SMTP id d9443c01a7336-21fb6f54a04mr65988345ad.22.1739340261184; Tue, 11 Feb 2025 22:04:21 -0800 (PST) Received: from localhost.localdomain ([172.56.121.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad53f6e2633sm5747411a12.16.2025.02.11.22.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 22:04:20 -0800 (PST) From: David Aguilar To: git@vger.kernel.org Cc: Patrick Steinhardt , Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , Phillip Wood Subject: [PATCH 1/6] xdiff: move sign comparison warning guard into each file Date: Tue, 11 Feb 2025 22:04:13 -0800 Message-ID: <20250212060418.1645241-1-davvid@gmail.com> X-Mailer: git-send-email 2.48.1.643.g32d702c6e8 Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Allow each file to fix the warnings guarded by the macro separately by moving the definition from the shared xinclude.h into each file that needs it. xmerge.c and xprepare.c do not contain any signed vs. unsigned comparisons so the definition was not included in these files. Signed-off-by: David Aguilar --- xdiff/xemit.c | 2 ++ xdiff/xhistogram.c | 2 ++ xdiff/xinclude.h | 2 -- xdiff/xpatience.c | 3 +++ xdiff/xutils.c | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 75f0fe4986..2b394a4806 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -20,6 +20,8 @@ * */ +#define DISABLE_SIGN_COMPARE_WARNINGS + #include "xinclude.h" static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 16a8fe2f3f..3d2b190fa6 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -41,6 +41,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define DISABLE_SIGN_COMPARE_WARNINGS + #include "xinclude.h" #define MAX_PTR UINT_MAX diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h index 7e56542526..a4285ac0eb 100644 --- a/xdiff/xinclude.h +++ b/xdiff/xinclude.h @@ -23,8 +23,6 @@ #if !defined(XINCLUDE_H) #define XINCLUDE_H -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "git-compat-util.h" #include "xmacros.h" #include "xdiff.h" diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c index a2d8955537..b0ba421b28 100644 --- a/xdiff/xpatience.c +++ b/xdiff/xpatience.c @@ -19,6 +19,9 @@ * Davide Libenzi * */ + +#define DISABLE_SIGN_COMPARE_WARNINGS + #include "xinclude.h" /* diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 9e36f24875..169edff5ab 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -20,6 +20,8 @@ * */ +#define DISABLE_SIGN_COMPARE_WARNINGS + #include "xinclude.h" From patchwork Wed Feb 12 06:04:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Aguilar X-Patchwork-Id: 13971095 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 515231D5CC5 for ; Wed, 12 Feb 2025 06:04:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340264; cv=none; b=er7yBhOiQmoNJ2QB+j4W11wO3chxIXFZkXpoyCxfLl28FjkKMnmDGXEm7dhUFbrlIGETTxnPyY8U/9UuTjsxlsraNj9He/Ny173zm3U8KpZMskaOF3S15o8mWC/b2MsHtDFsrhyNJxg2UZ4UW/1oHlz6x1ju/D72AvW/Q6c23BA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340264; c=relaxed/simple; bh=lXQjblvtRmvhzmyO/cwJHInTVHBhfiWTpGBIoxvftrY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPKziJ3VdHzxnIQrFKD1GJMPfFNyMjmxwvaq7LW/RCa7sh2paH+fFNcHy1T/9j+esnKkteULILKMMLgVvUYR5qdwRdjddoYvaVbdMaDeDHTXw3hLkudMBO6U9noP2eGDndApAS5EbXjlyUEmlLoK8SVqGJ9BfxKpvFTNUZOyuso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LvJ5ujDq; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LvJ5ujDq" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21f55fbb72bso83061445ad.2 for ; Tue, 11 Feb 2025 22:04:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739340262; x=1739945062; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+k4nCQ+nwbNpR8HFDJVE8FSyFVEroX3StH2yQ7Q/jkY=; b=LvJ5ujDqOL7isosKbuDE3LSurcYcBDRJtHG/SL96LCw1vPAZZVm+B//wvEGyEoFi7P lke+oCV4F8PCifPkm7fsk/cUOjYFn7W1xNGXWBjWDw3AbpOmFt/hr0z8geRd+0mJYBqj GsNx0uWW9B13KjaKVISNCUdqQQf0sKmZDpjFwrmd0TlwdppCmC3RxRkwyR6VyiVMomUe DDtj2YVaok7eHhB4vmqDZLTSqwVZ0AuhnwWJxPpLQCe/jQeGkjKFaHpZet/f3MnCrIVY puNZEh2DLhMKivkwx0mHsyLttoroFUlc94pN4tQ/ZsTeWxPuOoErnmuEndgH5a9wKhvh IzMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739340262; x=1739945062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+k4nCQ+nwbNpR8HFDJVE8FSyFVEroX3StH2yQ7Q/jkY=; b=nMKEiSs47NebKgSjd1clEq+oxywKGNeBAAb7Uhvi92g2w/680bkkilhuqbI4inG2M7 HYVxgKfNaxE5uVB4oB/0VPnUURB09i3S+iYDD8ZYWIamcsJSPZWfApDUNJVO/8scjflZ qMmI68ZYrk/JIWzyu4GhbeNnccxQWnrmBaG6DaGSEg/W3ai6vR8YMXeGCzsJBT1APUWj zQhWupWOolnbr+6559Jtmo9JEkUwEnQ+tE2MS+pl+CjX3GM8eSK/XtS25UKVEDL6iDgv B6g9ZkpppOt9BiH7b5m55LvNPaNh0tsYVwhEc5uJAktKkb/ZhrzrfbeOae6IO7vUdZoM Dk5g== X-Gm-Message-State: AOJu0YzUYWFQ/nVs4wHyZBVOmk9Y68w8d6iIOZV54NJpRU1GeExHVD3N Bc1ZmLL9NNXK+YF5sdunbNxT9BaUuEO/msc/5g6aHZQvu/OvE4jbQjtS3A== X-Gm-Gg: ASbGncv8yWxVLaZSSF8eYkYZ3oAuGWotAp4/9IEdVGpc8odnbgTJ18hlaiUOYqdBAh5 nnWaOP0TA4NuK9nedONWH/4+WJIi73N0WG0/oRLzsDdxAa7wKyh9byAAxlBZptqKdsNUAeBMfoZ tQYxheGmhVx9SxIztAAWZV4/d6nJF/3G6xQkFq5TVce3slLnpZ+yxklJdwkKMr7OmbpUlAOtBz6 VD63sK2uFcg6hCaqAvmq1l/jY9pFJcAtePFQRedyAf6Ho4O08iwDhrRVXKvICKIcr/giKU5pXu7 PPfXQAK/r50W3H7DCL/IK5vGdA== X-Google-Smtp-Source: AGHT+IFf9K+VvMuf4YSWXCCeWCrafF1MRvB1odOELPXi2RWtqvmL+LzqMBociHRCCKmScRezGEALZQ== X-Received: by 2002:a05:6a21:6f09:b0:1e0:d4f4:5b2f with SMTP id adf61e73a8af0-1ee5c83db92mr5016132637.32.1739340262538; Tue, 11 Feb 2025 22:04:22 -0800 (PST) Received: from localhost.localdomain ([172.56.121.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad53f6e2633sm5747411a12.16.2025.02.11.22.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 22:04:22 -0800 (PST) From: David Aguilar To: git@vger.kernel.org Cc: Patrick Steinhardt , Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , Phillip Wood Subject: [PATCH 2/6] xdiff: avoid signed vs. unsigned comparisons in xdiffi.c Date: Tue, 11 Feb 2025 22:04:14 -0800 Message-ID: <20250212060418.1645241-2-davvid@gmail.com> X-Mailer: git-send-email 2.48.1.643.g32d702c6e8 In-Reply-To: <20250212060418.1645241-1-davvid@gmail.com> References: <20250212060418.1645241-1-davvid@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The loop iteration variable is non-negative and only used in comparisons against other size_t values. Signed-off-by: David Aguilar --- xdiff/xdiffi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 4685ba6137..8889b8b62a 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -19,7 +19,6 @@ * Davide Libenzi * */ -#define DISABLE_SIGN_COMPARE_WARNINGS #include "xinclude.h" @@ -1014,7 +1013,7 @@ static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags) static int record_matches_regex(xrecord_t *rec, xpparam_t const *xpp) { regmatch_t regmatch; - int i; + size_t i; for (i = 0; i < xpp->ignore_regex_nr; i++) if (!regexec_buf(xpp->ignore_regex[i], rec->ptr, rec->size, 1, From patchwork Wed Feb 12 06:04:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Aguilar X-Patchwork-Id: 13971096 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C51B11FBC8D for ; Wed, 12 Feb 2025 06:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340266; cv=none; b=cMfeGjEr32H4nBmBcGytUjVNKPjJczIEQdZMtz+53xiobQ5DYhegfWB2W7N3Aks3eooJ4kKM7jdtMMwW42WAoXxNgVvRp+RL4vTn3680wbOeAmBnEL2atvlqRrEVyt5bzSHd2ltCCZU9nQVbm7H4DWuvbAXOSw31mX8XzFdJehU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340266; c=relaxed/simple; bh=2YbnX057ksrUFupptxYjHaoI0YSWx3mP0ofvPPL2WdA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rOhJEeZrtrOIyqnRKpFnp60N2H5SHtfYtd8bD7b/mVOb7Sxhxwe4cRSYTABa0aqLvg7qWd0ydJU7xGY8wQCJK9O5xQYwTZfRM8bN0jbPI8Dmh1R48g8WyoE02Yklg8CV7P3ZtpSmneE5XbxFSNooUQebgP82WGe1AdLUF2CnMHQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SZdFi56A; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SZdFi56A" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2f9d3d0f55dso9770035a91.1 for ; Tue, 11 Feb 2025 22:04:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739340264; x=1739945064; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oSH6w65KvivlXhnzYBx6S3vXnUds5Fc46isCh2g+ZeQ=; b=SZdFi56AXgpXKCheZ4Z3CCGYO/xWR4umccBWcDEFyau+MflEm/m/T9NeAPSHDQwMvi wcRAEESONAGXhHKHX1PrhcrQPFhvYPqJIpiFVtzghKGVwrk+6DGXV4KYTib4Ik4xwXiO CHtBaaJOtFtUaQzkHNbAgtUYQp/Z7e/VoqLK8r6r8V0a8hnmN6jjAWjRvsZ7TSONgLiK jwvVllm+gG11PEnKGFUcm3HO33Ptxr4X11DlePw2dKOU4sXeFLlYG+7FaliSt2VNxoDF v0A5w9VZQOriA9wYK1RxcfjGpJ5Ehc/eUVzvlbu5ljLwYAn0jqwMOLJ0IewHfXHFjLLz CaJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739340264; x=1739945064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oSH6w65KvivlXhnzYBx6S3vXnUds5Fc46isCh2g+ZeQ=; b=Uyvh5EiBYX2j+/l9oyAgEPdjlxB96aJj0kNSb5ojnkrjmSjCbGJ+q3Tmj5lzCa+vLc lyNx7rbpRmCYUF6559dAoBkQqNDuY/GAQpOERo3vWa7V5W4cLwTTv26ULAMs9HIhzSFh E2H9/Rst04qo6S+H0LljuiowYPI/QuasO/sOJKEM30+vuWHK9GJw8N8EEjNf7rmwL14V omF2rXags/PLU/ouun5igSQanWzH45nQ83x41OnjdaE6tOkNz/w/L1Beq2xzJndWTz8N KMDvCpR4P9WLQcoZrpfwIK66/WcxAl/ZP0h8KfbdCAhv4w0RfwWujtkP8Wsgn2sdnxz9 Ctsw== X-Gm-Message-State: AOJu0YxCpjxzXW/fjJOi2Myg9YizHfRFgFFWlLwuV6eh7l0RrpBG4Yc+ wmE0UrN7/uTgANTSNvsSBv/K9CpJFH/xvvWK+y/Luos7fOKjtlpOvEkw8g== X-Gm-Gg: ASbGncvfCwIOKCPxnhunwO2WXHgsN4IM0eusuzo3SSJrWRyXujQZdcDx6G8K/AsvncA UJC/85lsbf7XGiD0CZ2XgJN2YHzsc+CezzIBgosBfYTufQKf6PQpU5u/dWxsbjlMfl6cjwRAjGq rdK24X5H6PyNH9CwCUJ10rYpAH3qjXPiYHm3m9vDFftnxZwiLFMq5ygzr7IsYNKselDcbq0e08O 80lDeAKGoRv9brl7sDcLvH0mqU/R2qMnTBMP8gWfqIl0x5e04dU4el6S+q7MaWZKI7L+Lrkg8BH kIx20LPqdCzjpyn3VcS1wRbs2Q== X-Google-Smtp-Source: AGHT+IG98viJjrZQiPBQdwCRg1+aM5tRV04j1AXzs7YGy+p9nm1j8+gUrQU6pZTsvsNbyljkPVPEiw== X-Received: by 2002:a05:6a00:1802:b0:730:87cf:a7cd with SMTP id d2e1a72fcca58-7322c3889bdmr3873426b3a.8.1739340263990; Tue, 11 Feb 2025 22:04:23 -0800 (PST) Received: from localhost.localdomain ([172.56.121.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad53f6e2633sm5747411a12.16.2025.02.11.22.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 22:04:23 -0800 (PST) From: David Aguilar To: git@vger.kernel.org Cc: Patrick Steinhardt , Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , Phillip Wood Subject: [PATCH 3/6] xdiff: avoid signed vs. unsigned comparisons in xemit.c Date: Tue, 11 Feb 2025 22:04:15 -0800 Message-ID: <20250212060418.1645241-3-davvid@gmail.com> X-Mailer: git-send-email 2.48.1.643.g32d702c6e8 In-Reply-To: <20250212060418.1645241-1-davvid@gmail.com> References: <20250212060418.1645241-1-davvid@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The unsigned `ignored` variable causes expressions to promote to unsigned. Use a signed value to make comparisons use the same types. Signed-off-by: David Aguilar --- xdiff/xemit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 2b394a4806..f8e3f25b03 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -20,8 +20,6 @@ * */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { @@ -56,7 +54,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) xdchange_t *xch, *xchp, *lxch; long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen; long max_ignorable = xecfg->ctxlen; - unsigned long ignored = 0; /* number of ignored blank lines */ + long ignored = 0; /* number of ignored blank lines */ /* remove ignorable changes that are too far before other changes */ for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) { From patchwork Wed Feb 12 06:04:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Aguilar X-Patchwork-Id: 13971097 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 256081FBCA6 for ; Wed, 12 Feb 2025 06:04:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340267; cv=none; b=o71axp8i3rt5/4mfFtnKJUIYj57Q5KYXTZ5lPQbJ1ri79sLhHRSDFuxpIb0+J8pZ7F1dfZ0+hDt1H282WGxTA4swhUhOdI1Ke+tBkDI2Dhy8yxI1WE/kIYrS18s5mHEPqzH0tBBmjo2WqT/pU5Vqmo3QFdDTaMwB6FHQPxTqz/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340267; c=relaxed/simple; bh=fL69pxwvzP1JuwaqSjCtAJGgN5QWXwwmepS/hBbaCMM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pwafTb0Z3Knc9sBQWj5TLeE4nkWYqVg1UKhzKN4HeLNjrzxMzPErhg432RQSlOpfsXY86C+V0F0KGlVW85lxmsMHtZNpibHQPwaUUJ93XEj+IjHdo0XwK2uBlQAIvSpu/Olw7fyI/wYhyWM2vlteq26XTgtOfc9figBTV/UbfRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JtElrf+9; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JtElrf+9" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-220bfdfb3f4so6117785ad.2 for ; Tue, 11 Feb 2025 22:04:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739340265; x=1739945065; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d0rNeT5/m+hw80f6bZRvSzGIuOL+13rI13gR1BLQ1y8=; b=JtElrf+94GQeDSUMkpqeK+4HAA6UxqrEbKjs4lRDLQw2bc9lwVODHBVkAplqxS/bCT JPGFo4ZB7+PfopiXPYpXJkR1cD/H78cUTmmbkgegCiohnP7Da/H5B3axy+ixTsvtUMin ucRVXFz9hgvXhw6pfTBCSSfAHPba0XWaQinyiV9P6SCIuFZH22hD5vwPfz6dpJghccxl 4TfR+Ooz38RZxmuQlL7cCSlZKCrzUJ9f5xMRjQ/NowdLWUdA/xtUdvXyhDiNZ5kMZ2kW UO93Jrm+vCRH2PbiXzjs4lr5bxWrzhxU6eRaDqaOUf2n9f0D1bRPxIXdZp5wM8kvoux9 +81A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739340265; x=1739945065; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d0rNeT5/m+hw80f6bZRvSzGIuOL+13rI13gR1BLQ1y8=; b=ZIJrgspZTCtdIL4j4aDRykQVlB+qrQb6XgRcVnWu4L8leCr3WMIxLYigHcXWJvHrFu ms83c/EYGBvYMm2cJs8tlUtXq8KUGucfMo/Hl5afczmHYGX1N1dyCaDDV4ODns3KBgUi r5JU8Jcm28L61idB1dZbSdFYfr+4LrJF0XXkd1ovzgjeH7VlQ4YE/fde+JpSCeQL0Y23 qsDp/exaCKCnOetX/Z8TTx4gVaCOIdzxqrNJvtj/VdYoy/59LFJNJm8qQexlb5WWXznQ fJqTp3GhQOlT4gwmqNRSOfqb4zHpYocQjM3xSlX/7ljq6kQ2TcLbOAzMBYdjUYDhrvOE XMmw== X-Gm-Message-State: AOJu0YwV351F+oMcEuB/VFgYNdA+iQW4GhuQxKBfMvOLnrsq1tOMWKIz ILaxjmcewQK+9QK8/eBlUPZNnS+EdAAOtdY2UdAgL9wO+xnjnizpONj7zw== X-Gm-Gg: ASbGncuKYe9QM5nTUwRg7vhp1KVU1zl6+mtpq5Gh0U8SE6Jqvop2d+b6N23AmMhhC/Z NJPenUdrcBI1yKnPpd2FSS8XU9pRErb0hfgAWrZKedolRyekYsbJrPzG03BEPGIyqI0+Jm8C0z9 IPi0+/oOu8/iaCJoE5ZNRhg+XprlC+cRCqVpQrysQmYn52s+2CFcHOgstFXab8P4x7ok2V9g3P4 cU5MVgzsczif1RhzV7dOxc9KX+k4Og/j5hyiJ/Lt9AqhNVS7tFzIEd59tQn3dk/D3iZQZxw2woU kMSFxLPkvE7P3QS9YzOlCEswUg== X-Google-Smtp-Source: AGHT+IFSa1DfYD5pEuD28CdGciRJRdUUr0wgkBkf3PGN4qyTKcENcPbn1m+UzehggOGK1rCoyvxjZg== X-Received: by 2002:a05:6a20:4307:b0:1e0:c77c:450d with SMTP id adf61e73a8af0-1ee5c733a3amr3675166637.1.1739340265444; Tue, 11 Feb 2025 22:04:25 -0800 (PST) Received: from localhost.localdomain ([172.56.121.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad53f6e2633sm5747411a12.16.2025.02.11.22.04.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 22:04:24 -0800 (PST) From: David Aguilar To: git@vger.kernel.org Cc: Patrick Steinhardt , Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , Phillip Wood Subject: [PATCH 4/6] xdiff: avoid signed vs. unsigned comparisons in xhistogram.c Date: Tue, 11 Feb 2025 22:04:16 -0800 Message-ID: <20250212060418.1645241-4-davvid@gmail.com> X-Mailer: git-send-email 2.48.1.643.g32d702c6e8 In-Reply-To: <20250212060418.1645241-1-davvid@gmail.com> References: <20250212060418.1645241-1-davvid@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The comparisons all involve unsigned variables. Cast the comparison to unsigned to eliminate the mismatch. Signed-off-by: David Aguilar --- xdiff/xhistogram.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 3d2b190fa6..040d81e0bc 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -41,8 +41,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" #define MAX_PTR UINT_MAX @@ -108,7 +106,7 @@ static int scanA(struct histindex *index, int line1, int count1) unsigned int chain_len; struct record **rec_chain, *rec; - for (ptr = LINE_END(1); line1 <= ptr; ptr--) { + for (ptr = LINE_END(1); (unsigned int)line1 <= ptr; ptr--) { tbl_idx = TABLE_HASH(index, 1, ptr); rec_chain = index->records + tbl_idx; rec = *rec_chain; @@ -183,14 +181,14 @@ static int try_lcs(struct histindex *index, struct region *lcs, int b_ptr, be = bs; rc = rec->cnt; - while (line1 < as && line2 < bs + while ((unsigned int)line1 < as && (unsigned int)line2 < bs && CMP(index, 1, as - 1, 2, bs - 1)) { as--; bs--; if (1 < rc) rc = XDL_MIN(rc, CNT(index, as)); } - while (ae < LINE_END(1) && be < LINE_END(2) + while (ae < (unsigned int)LINE_END(1) && be < (unsigned int)LINE_END(2) && CMP(index, 1, ae + 1, 2, be + 1)) { ae++; be++; @@ -315,7 +313,7 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env, if (count1 <= 0 && count2 <= 0) return 0; - if (LINE_END(1) >= MAX_PTR) + if ((unsigned int)LINE_END(1) >= MAX_PTR) return -1; if (!count1) { From patchwork Wed Feb 12 06:04:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Aguilar X-Patchwork-Id: 13971098 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9DD91DC985 for ; Wed, 12 Feb 2025 06:04:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340269; cv=none; b=TfKv9pTsDaqPLjVPx0789Ca8fIa8pQjoOjw/HcfWWHuYqtDZiclHPCyoRqTZ4GN4GiHTLBAaYOK4QjeH7D5MUJQX0HwIM5GmCruJxoqxU/OFEA5UyLQ8W/8kn7rmXAQOlgLEaYNV06yCsjVjUDQXJDU4pBPKYzy2svubbTgvk8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340269; c=relaxed/simple; bh=QNByOcUdFZnAZ8TZc41iTiLsty18rBHAlkbJ3e4FzFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fg3WMOdGFSRzPdP8trTnmVKolZIhNRO3wLGCU3Fsmw18c+DD2Aov3A3jip0eFUxSMML4UfnY3rc7QeX/qTZqCpi62owLft63FSn0rTgKmn+/AUaJ1bk5HgDHSzdo+Ordae82jRIsTEeCcoNjh0kEBbWp8yQc6FigOBYc85+9JsQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WVx6x/Wm; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WVx6x/Wm" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21fa56e1583so45530355ad.3 for ; Tue, 11 Feb 2025 22:04:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739340267; x=1739945067; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NXTf0IfX9hnobaFYqLlJZU9Qp6He9+xF3Kz27EhE2Kc=; b=WVx6x/WmA8Q7/Z70CrqYpncI0xVtnbz92OqGLCy31MHRAYxJIqVgGtWXl8o5qo5279 zKyZYA7TKNkGdfpb/MyZnE5/0KHGO87ATGbfjL7WnEaH5FB3RzFctJ6diidbFXSUZVfj XG1HjCeCOtvLzOm1dYoTNuCuhFbuPtd0UdXqvBiQE7XbNzo2fK1Au1B3GWwfijmXeSuj jdXQDPUDQKCC+hvqmwtNEIXxk96vx7rCMVZEhXgnlpeXpLS4ALqVQu3g2pBL3miLxP0U /IRMn6Maz8s9g66GMoyWEV4ZGSjUvHamCqarwY3IBBR7ZqKRaydj7psH6nSTeKlHc8iy JeMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739340267; x=1739945067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NXTf0IfX9hnobaFYqLlJZU9Qp6He9+xF3Kz27EhE2Kc=; b=CJ7XRZjW5OQ1OKAFdPMCMGU6F9+Si28DZlEVJLJCNC6qKN8CfyugpHCl8cVcPaeT9L /1upAjJVSxMprs6oqP9j53/Hd2YvXiD7GHV+vlDGL89ibTWHB4bmFN17mRO9tUdHI4bE lwfM4OYxiafXan3Ba16w6yyKPxuxsoybkGLWknADtVOtA9yVfzm6ceWhLVBO/iFUiH4r erKbADykfu5L4J2/3QPGJTc/udDA8cJExKyiehvhYKGowfrCXjozI+yg3GHAqk9ah3Nk zKudMrkGdIUUjIJ6FzuNZob+vcJhYRGlcUNUp2XXW+7H0n5W7+cFqKnmfC4aVHsdFfXg /4uQ== X-Gm-Message-State: AOJu0YwjAfEqZuZ+Pa2Y2OhNlR9pQ/GyBgurOvp5O2lNlptYH8kaEBGk gZ5liR/AHO3Vicy0BYnkKX/QRFxXR4Kk7SxySPg6yI8WqOj8NVkT83q7Tw== X-Gm-Gg: ASbGncvYJFKiYcXvM1xGHe3Is0B49lEuxVXe8CxeveBYTgZRFw1lx9W8E4drPLoa4Uh n3DWvP0mZkyP/bL4V5H0Xm1+n6MJTiYYkHS6LJAS35KCw07oXp21o4BQind1idL7zrUkR0693uF blDSViPfo45LgygmxtOeX5Qa1LdS5U5XSVR1V3nV+uAAceozW1qW8nN2oAsbeuMczD5tvQsgOiu CDnvyl8iz58rQ5YE1pFhke2klwXXGVjmMpPcABx9c6fiIHsOzYzk+E0TuDlk5iASaqTQ0tkqm1S x5E5jAjbO+98qsSST7F3VnwLtg== X-Google-Smtp-Source: AGHT+IEfaDbO7A6SMloTj1Eo6olmDr8b6Wfrl4wlGf/TT49ksfHQPbQcUmcOSw0USurD1rLjLgC1JQ== X-Received: by 2002:a05:6a20:1595:b0:1db:ddba:8795 with SMTP id adf61e73a8af0-1ee5c821917mr4334685637.36.1739340266903; Tue, 11 Feb 2025 22:04:26 -0800 (PST) Received: from localhost.localdomain ([172.56.121.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad53f6e2633sm5747411a12.16.2025.02.11.22.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 22:04:26 -0800 (PST) From: David Aguilar To: git@vger.kernel.org Cc: Patrick Steinhardt , Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , Phillip Wood Subject: [PATCH 5/6] xdiff: avoid signed vs. unsigned comparisons in xpatience.c Date: Tue, 11 Feb 2025 22:04:17 -0800 Message-ID: <20250212060418.1645241-5-davvid@gmail.com> X-Mailer: git-send-email 2.48.1.643.g32d702c6e8 In-Reply-To: <20250212060418.1645241-1-davvid@gmail.com> References: <20250212060418.1645241-1-davvid@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The loop iteration variable is non-negative and used in comparisons against a size_t value. Use size_t to eliminate the mismatch. Signed-off-by: David Aguilar --- xdiff/xpatience.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c index b0ba421b28..82f663004e 100644 --- a/xdiff/xpatience.c +++ b/xdiff/xpatience.c @@ -20,8 +20,6 @@ * */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" /* @@ -78,7 +76,7 @@ struct hashmap { static int is_anchor(xpparam_t const *xpp, const char *line) { - int i; + size_t i; for (i = 0; i < xpp->anchors_nr; i++) { if (!strncmp(line, xpp->anchors[i], strlen(xpp->anchors[i]))) return 1; From patchwork Wed Feb 12 06:04:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Aguilar X-Patchwork-Id: 13971099 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3833D1FBCA6 for ; Wed, 12 Feb 2025 06:04:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340270; cv=none; b=JFZeFvYWioZ7jhetCu7XwY+vDfNr2wx12BRRK/KWRcZ1rn2w8XU/2GvFi5U/5qV88nZBuuMoU7EpXeGqE99ByhtO17Ca60i5FZHadY9ftcAuLQZLtkp8qNx95Ni1sD9LLwgCnS42OVhIwstwxsXJVIvjgdvq7uYZj7t5cJ3BNoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739340270; c=relaxed/simple; bh=z4oOteuTsO1wfDjhO0EUSRFQSuyfmqb1+GOFK6v7sC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C4vEBAUnUo6qV8gRlKdA/JyjOqvq5gfYOsbKfwyGiFsXbLdIaP0sea/ANzLb+/bXHBnnhGfaA95gbJVpWxhKPDP+BmpLmM6bPKbeXJN3wJytVeMYEvVeAlfV3/lXRCjfJIsdbRPNq0GkItg7+oR4gBq50PPpchXb6NBet7LmyMQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SX0Ls9p6; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SX0Ls9p6" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f7f1e1194so90223165ad.2 for ; Tue, 11 Feb 2025 22:04:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739340268; x=1739945068; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+n4MkGwwSrn9iOloBqOG2El9mfylZ8I2utSNPtiLQrw=; b=SX0Ls9p6ND8V3weIUm9aRXmr99Z8yG2n4zOJlaIj0u8PkvHdndLvF1JDzfBD4a709N i3pg1Li46Y+RdoaAEOL568X6uRjJDT3r29ecuzJgZAg4953FMD8UN/s7Gi+2dFFSrrbY uTF5K8HeM0O6AlaoLYEs1Nt0rlXj9LuQar6MU79YdpTfysNG+vO38TTrw0ydiERGIDlt KuYkErZn4KNRUxkW5K90uRcf3fJpbKnU4FPXBnTaN5jNJHBFavqaGqniZh1YpHETfpVZ DJIfQbBwIeQJg/wVy8lAEi2KqdLWmgBT3YwpBRO7EjTv6T6aNpLZwvoc2r53D5IMBdlh N/Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739340268; x=1739945068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+n4MkGwwSrn9iOloBqOG2El9mfylZ8I2utSNPtiLQrw=; b=SUBYjrUvURgXmm9XoY+SJnpByEzdzVEVIK+5g0d9SFvraQs2zAzPq4Pul0Rd0k0LSU SIYNQr3YE93r3SwN2tQzBg+mYTfA1ELYhlS4EdRDO6z1yr20CifG4XhucdviMkjZtI1K RSMiin1/osUNJiLkURKlz+eG/b3yqPzleuOAyVGQsISw/ReZ2vNKX8iG4Ptkv2z+S8pp FL6QwU7fIIx9mlv4BxSZvqoSgd1p3fyWGInj0zWP2uFntDqnFb9r5qQvmP2o41Wxgf4f ivaiHYYtFRYJY0b9EZ7cfBxfWUKTBiB4lOLghYvSywQ8S7ATzK07NRboyEgWkX5qcEXm +7dw== X-Gm-Message-State: AOJu0YxTl1LGeDHi4Qtg4L3tEam1Et/3q+WJ6ju44Wya+2UpncLshSFu mUIND9aKp9I5aIsRRHppo7O8o81allRkiwbD9wAxpjmqdLdwUK3JHnCUAg== X-Gm-Gg: ASbGncvpvPfu1917pXufD8iY70sx6EdMiNX8ooB/Y44Org5dQrG6mrBLbSpF/LenZc7 6SVByqRhYpqLo1fV5Rgk7maC6bx024AGw9Oe204f50b4CHfeetiisDmHnuTjJaIUkAn9mhapPII QC+YsQ/4UcvKQsIIp2Wvb9usRizJvtLTTy72TUABwjzc/fb5pAlm9fRxHEUU6zJdENYy8UtpGgD YBKPxwc2aVhEhye0tJzDYjT4IpBzrcdkF1oau4ZNqtF/jvr4mK3HjUbSw8oZWbj192nHzHaXBSB 7CY+wWotgLgWWtsBZRiAFwr0pA== X-Google-Smtp-Source: AGHT+IGtPuGkXwMo7gEEixZKESDt9WObsF67tINp+DlkiodVNgNei8rxRx0Oh7HHa2AcJGqgvw1cpw== X-Received: by 2002:a05:6a20:a10d:b0:1ed:a6d8:3439 with SMTP id adf61e73a8af0-1ee5c790a1dmr3851198637.22.1739340268402; Tue, 11 Feb 2025 22:04:28 -0800 (PST) Received: from localhost.localdomain ([172.56.121.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad53f6e2633sm5747411a12.16.2025.02.11.22.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 22:04:27 -0800 (PST) From: David Aguilar To: git@vger.kernel.org Cc: Patrick Steinhardt , Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , Phillip Wood Subject: [PATCH 6/6] xdiff: avoid signed vs. unsigned comparisons in xutils.c Date: Tue, 11 Feb 2025 22:04:18 -0800 Message-ID: <20250212060418.1645241-6-davvid@gmail.com> X-Mailer: git-send-email 2.48.1.643.g32d702c6e8 In-Reply-To: <20250212060418.1645241-1-davvid@gmail.com> References: <20250212060418.1645241-1-davvid@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The comparisons all involve comparisons against unsigned values. Signed-off-by: David Aguilar --- xdiff/xutils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 169edff5ab..444a108f87 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -20,8 +20,6 @@ * */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" @@ -377,7 +375,7 @@ static int xdl_format_hunk_hdr(long s1, long c1, long s2, long c2, nb += 3; if (func && funclen) { buf[nb++] = ' '; - if (funclen > sizeof(buf) - nb - 1) + if ((size_t)funclen > sizeof(buf) - nb - 1) funclen = sizeof(buf) - nb - 1; memcpy(buf + nb, func, funclen); nb += funclen; @@ -439,7 +437,7 @@ void* xdl_alloc_grow_helper(void *p, long nr, long *alloc, size_t size) { void *tmp = NULL; size_t n = ((LONG_MAX - 16) / 2 >= *alloc) ? 2 * *alloc + 16 : LONG_MAX; - if (nr > n) + if ((size_t)nr > n) n = nr; if (SIZE_MAX / size >= n) tmp = xdl_realloc(p, n * size);