From patchwork Sun Feb 9 08:12:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zejun Zhao X-Patchwork-Id: 13966691 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) (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 034FD140E30 for ; Sun, 9 Feb 2025 08:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088812; cv=none; b=HS6hI7EX4wzitFcudpblCCriqX0BGm0KjskOof8LLXhbtsVuVwi4sW2er3mzraSL7dk4MeyhPStd/9b7P7TUmSVuOyweVGT/itfjPml/kn0UCVY4H1qvcVlWLVGCTHILm8E5hHma3L8QcBHxXozRAWdvWJTtruUrQVM9aYg+M2g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088812; c=relaxed/simple; bh=NJikPuKNwISHQeQ3TVoqZqfYSY+3kUl9QJo01SgTVK8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jHcErYe8DTK387JP/gwyWMwzZlbyuSLqo6ZYVKfoRTU8lU+JaAxAOL9YK3YWt1Qmsy730seaKxyHb8nDA3YJvN4K+jh40SFKlcluJKOG3+OJ1B9+AYtV8SYg9vv4qwMmpxVz8YGtzkhHkJ0gvNHkppwW3BksutvP8Fmjf0/IK44= 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=a//D6gez; arc=none smtp.client-ip=209.85.214.196 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="a//D6gez" Received: by mail-pl1-f196.google.com with SMTP id d9443c01a7336-21f0444b478so48909585ad.0 for ; Sun, 09 Feb 2025 00:13:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739088810; x=1739693610; 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=ybgQA1cqc06IGa1m/tubJjRRf6SHIAoi4J+F/FjZuao=; b=a//D6gezGCcNPYaJ2LQx9b/6540rxrq5wvj2bmGz9Vz2w/ziGPAtGlUNdw6qB8UeDp oCnzb0EJc1effKceK5MZGpdGFC5068YPX2NTBe6KLldVLvmHd9ZM5xSr6bNvqgHFFFpF 3BhAy7+hkrdFip/s+HSAtUmeXeMCmEQJiKQ9uZoEKcNpNjR5l/j4f20QLRf8eIETOKXE aTAXw/J8PEzWoEbDGSkBBZb61Z/mpgrKPEC13D9Deaek/bFdTkQLlH/Brr6Col1H0ogc TlI/y4f8smccNmE6UJaH4s3H8Sp+smKfsHfLjrb9s8+5gep8/Qo4t7D1qJ4/YQVteikp 7NMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739088810; x=1739693610; 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=ybgQA1cqc06IGa1m/tubJjRRf6SHIAoi4J+F/FjZuao=; b=ODLwVKntju0EQKRIb8g8Hgt9Ng0sWCCA6c/Ah5PqPHntbgSAN5gVmwqq595TkIW5zI ulK59mPdwgOgRLCQEgDUYCdPUvFavBhDMNdGh/Bu4n6jU8wGWOdqoDx1NT2aPnAv7+2Z lb6hfdPl+qKyJDgVW5AATDyj5R5q9MwzsmK0p3MmnT66w198OUQ/9VbvgSLhPD2GqJR2 1Bl/+JygXDRR2kbRmDT4yXsIu7GOlIsvCrGwV2A0BbW0ayCbPNQ3EScndBuDAqld9HnK dr3MHxYyc87WVSDWEUD9ms+WdOpW1MMo/8UY40n0L+Ltm5R+c00Q8Ji4WVAhHBb0C5iQ lKxg== X-Gm-Message-State: AOJu0YyRJlz1+GqsciZqFL6v5K3NU8UeyhMFs6gpaOkMo0yW/ziGq0Ms gvBcKjX3JUVHZuqUcbCHlTml9fLibmva9KE1Y8kc97t6A21WZo/R X-Gm-Gg: ASbGncuAVbUG0JFM4X7mu48z3ZKtrdGJ5KogrumPed1hZh2LA088V+iBgDUckJ0eZdp KyXNUTVkC3yqowV6dbVF5Ll0zhmLc8j8JD4rUxesmWrRf3UgbvWXUxPDU2oeovuoHcGYZbJ/REj txawveFtP996iuV/VK5AtwcpxoBxxREuY66O5VrNtcRcS5y5mYfEYWPSQDrQ5y15UuJOUkS8UBc KKDuBH98yQtp24VDi68NpqDbYaxgdtl3st3TZWSYm9PNXyrfeI2o1uO+INkA0yRW0lbhCEA3//Z FpbNuDCVvX6aNxMmYg4K4AWSKJjwzowN8dN2hHcedBs233282tJUIA== X-Google-Smtp-Source: AGHT+IHIXFEdkowixH8dvDFK7PUaYjcO2ITWGlv0M8fdacxi8tlRpMMMcVP/P0h/Cql7ZJTgqhFpCA== X-Received: by 2002:a05:6a20:6f87:b0:1e1:a75a:c452 with SMTP id adf61e73a8af0-1ee03a8dc54mr15211467637.19.1739088810163; Sun, 09 Feb 2025 00:13:30 -0800 (PST) Received: from Ubuntu-ROG-Strix-G512LV.. ([103.116.72.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730889e0c5fsm466308b3a.119.2025.02.09.00.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 00:13:29 -0800 (PST) From: Zejun Zhao To: jelly.zhao.42@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com, ps@pks.im Subject: [GSOC][PATCH v2 1/6] apply: change fields in `apply_state` to unsigned Date: Sun, 9 Feb 2025 08:12:11 +0000 Message-ID: <20250209081216.241350-2-jelly.zhao.42@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250209081216.241350-1-jelly.zhao.42@gmail.com> References: <20250205014055.737190-1-jelly.zhao.42@gmail.com> <20250209081216.241350-1-jelly.zhao.42@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 `.max_change` and `.max_len` of `apply_state` are only used as unsigned integers. Misuse of `int` type would cause -Wsign-comparison warnings. Fix this by - change `.max_change`'s type to `unsigned` since it's just a counter - change `.max_len`'s type to `size_t` since it's a length - change the types of relevant variables in function `show_stats` Note that `printf`'s format string requires us to do some typecast (from `size_t` to `int`) on `max` in function `show_stats`. This is safe because we already set a upper bound of `50` for `max` before the cast. Signed-off-by: Zejun Zhao --- apply.c | 9 +++++---- apply.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apply.c b/apply.c index 4a7b6120ac..831b338155 100644 --- a/apply.c +++ b/apply.c @@ -2238,7 +2238,8 @@ static void show_stats(struct apply_state *state, struct patch *patch) { struct strbuf qname = STRBUF_INIT; char *cp = patch->new_name ? patch->new_name : patch->old_name; - int max, add, del; + size_t max; + unsigned add, del; quote_c_style(cp, &qname, NULL, 0); @@ -2257,12 +2258,12 @@ static void show_stats(struct apply_state *state, struct patch *patch) } if (patch->is_binary) { - printf(" %-*s | Bin\n", max, qname.buf); + printf(" %-*s | Bin\n", (int) max, qname.buf); strbuf_release(&qname); return; } - printf(" %-*s |", max, qname.buf); + printf(" %-*s |", (int) max, qname.buf); strbuf_release(&qname); /* @@ -2273,7 +2274,7 @@ static void show_stats(struct apply_state *state, struct patch *patch) del = patch->lines_deleted; if (state->max_change > 0) { - int total = ((add + del) * max + state->max_change / 2) / state->max_change; + unsigned total = ((add + del) * max + state->max_change / 2) / state->max_change; add = (add * max + state->max_change / 2) / state->max_change; del = total - add; } diff --git a/apply.h b/apply.h index 90e887ec0e..f7f369d44f 100644 --- a/apply.h +++ b/apply.h @@ -90,8 +90,8 @@ struct apply_state { * we've seen, and the longest filename. That allows us to do simple * scaling. */ - int max_change; - int max_len; + unsigned max_change; + size_t max_len; /* * Records filenames that have been touched, in order to handle From patchwork Sun Feb 9 08:12:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zejun Zhao X-Patchwork-Id: 13966692 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) (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 A2E64288DB for ; Sun, 9 Feb 2025 08:13:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.67 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088818; cv=none; b=V5NFyorWZtdl1cXe0VfEZeboAoJ+h9wn+QzRtA0V+rEUFGYr0sO8upVHigOYW3+oQMrptm7xNdKazk1ahRAVTK3DVljnjr7FvEIjnf0LeuP1+z1Ng2rM242uiQk3TzIDQxaLu1QfsnMeBXigeG6fCDljse7mEruZOtNpzj+SUQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088818; c=relaxed/simple; bh=0/3eSsWfMjhpw9FQS+Nj0sPH1rccMPdvo9Nbw3ZWoMs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nOWrVzUUEUPFDcfgbcrdAETkSS6b43QMRbE9R6moryjPKNw+cUYZi5lhAixSFPSZgIJwmpfyCgLDZ/2Qxj/YwqxNvQYm6J70+PsYtsVGrxKVgDRIZkbUkYVV7ICsFpbbW1I2WOnXAqXgcMgOKD+gpkAJtH+EOTCs3uEXv60xvfw= 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=fQbKs5hN; arc=none smtp.client-ip=209.85.216.67 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="fQbKs5hN" Received: by mail-pj1-f67.google.com with SMTP id 98e67ed59e1d1-2fa2eb7eb45so2675707a91.1 for ; Sun, 09 Feb 2025 00:13:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739088816; x=1739693616; 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=bO/R53160RWn0GnpXvWnlIBN30qIt/TQWpLL1/oGE8Y=; b=fQbKs5hNDQ/uGcr5SQWeCVQYd91K2hFFsyCwkK2oP1NQ0qZnC610M5M1uzbOiZpRY5 hv8NZDygeAH87gj/B17XY1RBj6UsIOWU+CeB9p3j1+DopdwI3f1bdd1jKx/TWztc/ZNp KhcW8xf0pe7HnLTWb+okzNi22EOBrpNDoZ6KH7/1EUOVcqroaAXWSnc6pSDagH27mlS4 C2Nt5k2JQ37PgSxEdJJSBnIjsuE0eeykQXTu0VX45AwBdQoMtkuK7ebEOybdGbfw4I7h QIxUmm1YZ3lTfcMK4XS6/lKupRV54WFW8hNdSX/MCWnYHlZczry6FnV59pmhAdVbF2DJ R4Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739088816; x=1739693616; 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=bO/R53160RWn0GnpXvWnlIBN30qIt/TQWpLL1/oGE8Y=; b=JN2fySgZ/fwHGXw03ujcgx5pv3zpBDs98W/Zc64yT2spkMoIhIqXxwfukhRa3pHR78 LDPomE8SeDExXmp5CufYpSMnzQ0WY0i1Zw3AkqEyXv2hIK/gHqSyn8jxzc1/2m+yuTGN Kq2OAju0pV6vcLZ8RawcUiX9EuFBAD1Pkee+AtxyXpS1ErQFlG/F0EBzttlx4aFjiaiH H+WFjUqe9AtYO8FjAQLk3FJz61+dY9moEorHV/KEGtzy+N0A/jIL1janJRydrsrrBkc3 AH+d3bquwpLXU/feNU4OpJ6b5Z2PsvO16Fr9wUDWjJzmo9Sgb/AIkQQePnq0uGsFVbqM Eh5w== X-Gm-Message-State: AOJu0YwifPxsyNiDhZW+j3jsNFz2DWxE/z4YYl7+UI2Rm55ELr5bxsjl 1UfRneDlh5YzOHmPt6rR6d/gU+02EmXSGO6I4CdMTHe6XVrUGUn0 X-Gm-Gg: ASbGncuxM70NybaaT5VoaQzYNlN6JUiLmeBthY2qLIUXlNPrYLlhgaiD94UzD/zlnK2 kGbvEcr4uoFOj8Hy2I9AaaN6gorYsFabl7qTUoogqy3vkC5hHvT835MOk83LN9Ra6XRd4ZYtGrc OCJ+u8416JTyebeZDilCp5P58WryQo7bBQbyibKVKtc3UNTJbhuW2G7jrCfvcN33L52FD0oU+o0 xMhJdCXwTSeuayMLgZOPUFWQS8OGAmPF6YSGOl13Fg9vAR5heLi0/geUJ099So3oF+nCcgJ+BhR IiW3q/AXcjZgteYnMq9OP5sDfdWgy9LUcnBrsKkTY6VeMN9opgqYIQ== X-Google-Smtp-Source: AGHT+IG0qja+J0joEhurj5CZx5FKaGs7cpEBCjK2lCwZ8azRlSlwfcmr3VCKcD63EaRXPW6aAzW3Zw== X-Received: by 2002:a05:6a00:3910:b0:725:4915:c10 with SMTP id d2e1a72fcca58-73042cb59c1mr26936290b3a.10.1739088815714; Sun, 09 Feb 2025 00:13:35 -0800 (PST) Received: from Ubuntu-ROG-Strix-G512LV.. ([103.116.72.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730889e0c5fsm466308b3a.119.2025.02.09.00.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 00:13:35 -0800 (PST) From: Zejun Zhao To: jelly.zhao.42@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com, ps@pks.im Subject: [GSOC][PATCH v2 2/6] apply: change some variables from `int` to `size_t` Date: Sun, 9 Feb 2025 08:12:12 +0000 Message-ID: <20250209081216.241350-3-jelly.zhao.42@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250209081216.241350-1-jelly.zhao.42@gmail.com> References: <20250205014055.737190-1-jelly.zhao.42@gmail.com> <20250209081216.241350-1-jelly.zhao.42@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some assigned variables are mistyped as `int`, including - those whose values come from a system function returning `size_t`, - those that are used for array indexing, - those that represent length/size/distance, some of which will trigger -Wsign-comparison warnings. Change some of them to `size_t`/`unsigned`. Signed-off-by: Zejun Zhao --- apply.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/apply.c b/apply.c index 831b338155..b4ae74a5fb 100644 --- a/apply.c +++ b/apply.c @@ -1087,7 +1087,7 @@ static int gitdiff_index(struct gitdiff_data *state, * and optional space with octal mode. */ const char *ptr, *eol; - int len; + size_t len; const unsigned hexsz = the_hash_algo->hexsz; ptr = strchr(line, '.'); @@ -2185,7 +2185,7 @@ static int parse_chunk(struct apply_state *state, char *buffer, unsigned long si }; int i; for (i = 0; binhdr[i]; i++) { - int len = strlen(binhdr[i]); + size_t len = strlen(binhdr[i]); if (len < size - hd && !memcmp(binhdr[i], buffer + hd, len)) { state->linenr++; @@ -2320,7 +2320,8 @@ static void update_pre_post_images(struct image *preimage, { struct image fixed_preimage = IMAGE_INIT; size_t insert_pos = 0; - int i, ctx, reduced; + int i, reduced; + size_t ctx; const char *fixed; /* @@ -2492,7 +2493,7 @@ static int match_fragment(struct apply_state *state, struct strbuf fixed = STRBUF_INIT; char *fixed_buf; size_t fixed_len; - int preimage_limit; + size_t preimage_limit; int ret; if (preimage->line_nr + current_lno <= img->line_nr) { @@ -2706,7 +2707,7 @@ static int find_pos(struct apply_state *state, { int i; unsigned long backwards, forwards, current; - int backwards_lno, forwards_lno, current_lno; + size_t backwards_lno, forwards_lno, current_lno; /* * When running with --allow-overlap, it is possible that a hunk is @@ -2791,7 +2792,7 @@ static int find_pos(struct apply_state *state, */ static void update_image(struct apply_state *state, struct image *img, - int applied_pos, + size_t applied_pos, struct image *preimage, struct image *postimage) { @@ -2803,7 +2804,7 @@ static void update_image(struct apply_state *state, size_t remove_count, insert_count, applied_at = 0; size_t result_alloc; char *result; - int preimage_limit; + size_t preimage_limit; /* * If we are removing blank lines at the end of img, @@ -4288,19 +4289,19 @@ static void summary_patch_list(struct patch *patch) static void patch_stats(struct apply_state *state, struct patch *patch) { - int lines = patch->lines_added + patch->lines_deleted; + unsigned lines = patch->lines_added + patch->lines_deleted; if (lines > state->max_change) state->max_change = lines; if (patch->old_name) { - int len = quote_c_style(patch->old_name, NULL, NULL, 0); + size_t len = quote_c_style(patch->old_name, NULL, NULL, 0); if (!len) len = strlen(patch->old_name); if (len > state->max_len) state->max_len = len; } if (patch->new_name) { - int len = quote_c_style(patch->new_name, NULL, NULL, 0); + size_t len = quote_c_style(patch->new_name, NULL, NULL, 0); if (!len) len = strlen(patch->new_name); if (len > state->max_len) From patchwork Sun Feb 9 08:12:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zejun Zhao X-Patchwork-Id: 13966693 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) (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 59954288DB for ; Sun, 9 Feb 2025 08:13:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088822; cv=none; b=MOpDZEmBRKYWldWj1FYK/olZNeytF6AZjl1vFWZfAFvqli95IkkP0oRDgot7VwSGXre38DTfCND5NJi64u8Sy12sLv9s87wezbqu+JJPwRPKTu0GZkL8a6h7gvMBHmdEzP97NmbgRL93RJHOSnjn9Z8SbtEAzQrCVx3K14/3g0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088822; c=relaxed/simple; bh=HG3v2LaxzyHMchCC7wLKSOVktI6lDxs7n45A3wG3rZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jmxz0Hz3uTjKChJCXyh5CMsnINMvCxtQNpHJL79CSsuhSF2TeutBxqHDF+LN3GEAYvecxzrJeKIt3F1abK/n6Aun5s5csxvjQSBhyeWXAq62eTGCp242fenaiDbW5cYbUkXF3a5X+uMrIbQ6XEZcQkOsKOfP5MSZNRhmt88zlwk= 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=bGNX24+K; arc=none smtp.client-ip=209.85.214.196 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="bGNX24+K" Received: by mail-pl1-f196.google.com with SMTP id d9443c01a7336-21f44e7eae4so49574555ad.2 for ; Sun, 09 Feb 2025 00:13:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739088820; x=1739693620; 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=r6PUmiovXZsbWjwJTrd/5cRAqKcF0hslGXrZuwN6gcg=; b=bGNX24+KxCpZtZaEneLF1j1DJl+P/6W0H8Bv9w2KzsDXogGe/gEFwGEZH0dTdyNTOi 1Z4vN+4SsHbNMXsV3r68WTSmfUFbI2cbxE6N1nTWkUJtT/3VUUTWjwUXQjo0zb/1L9Dx A/yeg3x42cLbrXnfwLU1gVh4EbWmBqeOG+QYLADPUOTskQWpZ8TGP8MwuzA1vs2wdQTM nVzDcleAuN4cZj0cnod77JYodpXtggwVGp0OFjb7pTnMEn8yLQN4+jBNP8wSIKCW/ONL c71naGY1/EkNEbcFcQppbBIwT4GyZia2E+xpqhZg+fGwLy4Kgz6GAizUqUuRPWjt2DfX UdiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739088820; x=1739693620; 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=r6PUmiovXZsbWjwJTrd/5cRAqKcF0hslGXrZuwN6gcg=; b=L1LDFPTLBMFS8oQK0NJ8ka2rGp2laCHBo1I7e/JYv6uBVKt8NmPmQq51Xo763UnHC5 T+Go4Z+13laKEbH39Bklf+KWbLELO4cua6DOB0UfmMwkjVWVuvnRUAePTmNZtm2iKQ0A gFFZYjnVYR6GyA3wYBJ6fGU1ex9AH9z7tGpkIeoawvm1P/u/DwBQL7W1pB+7baAErBC6 15X6kB1Uz/IFEPRVGDmLCS5fMnpm9KgcBA+sw0X4eQlqKJOz1oKCmOYeivH/mGk1nKKO lw/YaMZJyEd5PCxohEepHf53gxkGfwhTdWvNDhKQgEjTvaf5k6TJoTlQ0XQaYhFP3FmF THLg== X-Gm-Message-State: AOJu0YwvcAU9Y347sbCZLhz+cn27CSMKwQD78Irlnl/sQjck0O7GxrHT 4GslG+Ps4zC70O313Is7v4EVleNLsSK9HDtiDgXag2wUt7pEjHko X-Gm-Gg: ASbGnctU9n1rulDngxdVdWa2iRkjxAmapvANLMWZjBfDa+E7/YLmVq6Y4H2YbaQck4U Eub8RWzyok2/JeoodHtJUOs2+JvBcHAZo1g3jxOd5Ae8H+ni1db1+0HwYh4FF3DiN3/R0T4mMIr nXoLSIyFWlqJVopYjgl6NP3Cb0Nwmafx+ic4K9sB1osKPvk/ZblmKTtefJexdNbs+zzZTTzVSXA oNOmLcZxNazLRDIvPf5uV4ZQLNW/9z6myh2+WgMLdtyvJiFPghHjyF9k038Vh7/FMEVKVEHbRdT yPtK6CnBh8+rInpFZp4OW2Eom5CiSkxrMY0Z5iMa9hkocGvYdzm8bw== X-Google-Smtp-Source: AGHT+IEoux/9CaeaWpY1xCthA93f8AeGHgnoPaV5TH6x5/FF3weQI0no9SbeLrZL758KCVvjUddrHw== X-Received: by 2002:a05:6a00:2e27:b0:725:db34:6a7d with SMTP id d2e1a72fcca58-7305d5931cdmr14221790b3a.23.1739088820532; Sun, 09 Feb 2025 00:13:40 -0800 (PST) Received: from Ubuntu-ROG-Strix-G512LV.. ([103.116.72.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730889e0c5fsm466308b3a.119.2025.02.09.00.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 00:13:40 -0800 (PST) From: Zejun Zhao To: jelly.zhao.42@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com, ps@pks.im Subject: [GSOC][PATCH v2 3/6] apply: do a typecast to eliminate warnings Date: Sun, 9 Feb 2025 08:12:13 +0000 Message-ID: <20250209081216.241350-4-jelly.zhao.42@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250209081216.241350-1-jelly.zhao.42@gmail.com> References: <20250205014055.737190-1-jelly.zhao.42@gmail.com> <20250209081216.241350-1-jelly.zhao.42@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 `git_hdr_len` is an `int` variable that can be negative and is used to compare against a `len` of `size_t`, which will trigger -Wsign-comparison warnings Cast `git_hdr_len` to `size_t` after an above-zero check. Signed-off-by: Zejun Zhao --- apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply.c b/apply.c index b4ae74a5fb..605a0aa2e3 100644 --- a/apply.c +++ b/apply.c @@ -1592,7 +1592,7 @@ static int find_header(struct apply_state *state, size, patch); if (git_hdr_len < 0) return -128; - if (git_hdr_len <= len) + if ((size_t) git_hdr_len <= len) continue; *hdrsize = git_hdr_len; return offset; From patchwork Sun Feb 9 08:12:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zejun Zhao X-Patchwork-Id: 13966694 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 DACDB140E30 for ; Sun, 9 Feb 2025 08:13:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088826; cv=none; b=Gd/bvDa+ToH2yOJQaqliTIxtXWoXG3aAAgLL+u7ITRq0UE1Z2KKuPoHZ47sotPgG1FjjRHNpjl0mwaZ876NtTyXZyY/uDWsS8CzD3S1EDLCUfj4gwH/SCtRWuoMa8Y6iVV0FocPY9kz3X+tRxbkiOXZY/drfNo4R73686to3Okk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088826; c=relaxed/simple; bh=JQfQWt3ORky/Unn4e5BeFjC437CPi+ms7hyd3XsiVmk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o5OFkBo7IXgFT6Jhb7f/cRt1r+cINBGLHFRiHRebH4Q/LscJ/O4N4GAG2bCD3txGWQrihN1dpJ9YcCowkX7mW/zerAOJUkVndg1U4VJQPX6N6XzjV4w1LYJmHBFIKmHiPh1dPlUkw/2+88STnzy/CmCnedNfTgIm7/IPYPVVJeM= 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=kvayzsxt; arc=none smtp.client-ip=209.85.214.193 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="kvayzsxt" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-21f50895565so29080785ad.2 for ; Sun, 09 Feb 2025 00:13:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739088824; x=1739693624; 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=ZPCrQdX4kh1XvhA6zM6EjEvn4vH0XKC/gG3vJcXMSQ4=; b=kvayzsxtRXJfuQdSa73JQdcaJaPcxLFjKFvVZ8vLciQjuAVRbUHqhFQjmTAyvqoo6q Q8PPD7Ys8pE9HAkvFlwBWf5trWgeebmBvDbHNtvv0WXqTPTFlsl0qLG+QP3GAipajsb1 rdALjK8R6texPYmPcEVHBQpZqYkuvRvCoA7u8Rg05A5wWBSIAR+3B2JCNrigc7T4uaiK IUtw4X9pFjyVAcIYVLtaFESJK/P2PYHgQDSIDjZdshAmlSEimA4T5RvWtj7ym2Q+AjGb JmFilro/csYrMjGntv71pMSo12wrePdduSbmfxu6I6J9NHY5ycSmYvRc68EsVOWpFE33 GAtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739088824; x=1739693624; 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=ZPCrQdX4kh1XvhA6zM6EjEvn4vH0XKC/gG3vJcXMSQ4=; b=GI8oKj0Bltw7+/6SVafvcjV1xHlCBK+M2xZlyUdRPvx2LVKzlu7teyXf+PpvTVE1tD HOYkoNGMN6Zi3t62mGvVedrfqDNw3/iASh95dyD8dx0DsnmGb5mRIW+OxCbjlQVgttFW /mJ/hZN4cXF9WMdsC1ZIjLcG4iU88USPfaCZa4KCjg1HIRmbisdh2U3XqjZwCOC5I0eh dXJp02O+EgwrPxtemqCzKse5OHvbQGskIPGVyISRdtzWYvjjS7oAayOJY4c720bZfzwg AMEx/cKHuXs2aZLGdTQyCApktmWoXjwOjH4c8AJOke/COXuwHVwL+YvvMbRsT1rHrsTv vytA== X-Gm-Message-State: AOJu0YzCjadBnvf2EDmsJcHMVZXym4o6fa4LO5nBEppNy4pMHFli1ed/ NEYTiVeMLKAGms+esQmuGwt93kNX26KUr0fVXkyfG/5h9cYLDgeK X-Gm-Gg: ASbGnctzuIBXwxTIoSSjHAXZnT538sIWMu8zxrtmzcFaSTobtnbxSSO4HTlcYyy7HPj SxoVMtYw3mnAcRKc7GM51CXmYGgH9cKAYpoxuoQ93aRH6+B60xmVEuwKmYFFw0riSZ00Ex7Umcx CqbM069LqEPGI4MY5SCOjPLOtHSUAlaT8WyAzCWLADNPgO9Zg1LL1MwmmXABaBAy8w3PgRTgvLN h6KHuFMQCLdJFgeqtYZICpAcNLAAzPQUdj4Zs+T1KeaYDwV7nlf41UwLY6qom7xMxuXGCJylA5X k/wNZqZ8hBdZCtxNevS/qTheBBLzrOVNDU56wLVsuqFxfabyDnHNBQ== X-Google-Smtp-Source: AGHT+IEp6mhm1OC48iY/t8VZvSJEbTuwk8XWgwEvWbNH+iaeoB97Ho3HZFGdze5aNedTn3muftQ/Yg== X-Received: by 2002:a05:6a00:3d16:b0:72a:8f07:2bf2 with SMTP id d2e1a72fcca58-7305d44e557mr16145207b3a.9.1739088824220; Sun, 09 Feb 2025 00:13:44 -0800 (PST) Received: from Ubuntu-ROG-Strix-G512LV.. ([103.116.72.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730889e0c5fsm466308b3a.119.2025.02.09.00.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 00:13:43 -0800 (PST) From: Zejun Zhao To: jelly.zhao.42@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com, ps@pks.im Subject: [GSOC][PATCH v2 4/6] apply: cast some ptrdiff_t's to size_t's Date: Sun, 9 Feb 2025 08:12:14 +0000 Message-ID: <20250209081216.241350-5-jelly.zhao.42@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250209081216.241350-1-jelly.zhao.42@gmail.com> References: <20250205014055.737190-1-jelly.zhao.42@gmail.com> <20250209081216.241350-1-jelly.zhao.42@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are several -Wsign-comparison warnings in "apply.c", complaining about us comparing ptrdiff_t's with size_t's. Fix these warnings by typecasting from ptrdiff_t to size_t. As to why the casts is safe, - in function `date_len`, `date` is the starting address of a date at the end of the `line` and is guaranteed to be larger than (or equal to) `line` - in function `git_header_name`, `cp` is guaranteed to be larger than (or equal to) `second`, so `line + len` is greater than (or equal to) `cp` since we already treat `line + len - second` as a size_t - in function `git_header_name`, we are iterating `name` using `second`, so `second` is guaranteed to be greater than (or equal to) `name` Signed-off-by: Zejun Zhao --- apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apply.c b/apply.c index 605a0aa2e3..72464fb6c2 100644 --- a/apply.c +++ b/apply.c @@ -540,7 +540,7 @@ static size_t date_len(const char *line, size_t len) !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ return 0; - if (date - line >= strlen("19") && + if ((size_t) (date - line) >= strlen("19") && isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ date -= strlen("19"); @@ -1207,7 +1207,7 @@ static char *git_header_name(int p_value, cp = skip_tree_prefix(p_value, second, line + llen - second); if (!cp) goto free_and_fail1; - if (line + llen - cp != first.len || + if ((size_t) (line + llen - cp) != first.len || memcmp(first.buf, cp, first.len)) goto free_and_fail1; return strbuf_detach(&first, NULL); @@ -1240,7 +1240,7 @@ static char *git_header_name(int p_value, goto free_and_fail2; len = sp.buf + sp.len - np; - if (len < second - name && + if (len < (size_t) (second - name) && !strncmp(np, name, len) && isspace(name[len])) { /* Good */ From patchwork Sun Feb 9 08:12:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zejun Zhao X-Patchwork-Id: 13966695 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (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 A3387140E30 for ; Sun, 9 Feb 2025 08:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088830; cv=none; b=n51oxBwLBdpipIoyw7bOZCxqG5zjMXTBSEfYJt9+ixv0unEpWu/cgRbB7ThVP8u/G1ucxAsZMwqPAwkSDqrAGqjXNrxfcJkwU0kBd9Viq3TZPUkcEZ4JW036DJsw5ob0Ba2IMooFwuzqex6K8CPBJRrbPZnT3wL4UlTxUG4kDY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088830; c=relaxed/simple; bh=WXfvyp3Y4Idu9G7mzt+JtYJS0fnU7RyvD3pui1IemEQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sHJYia70U9gtUlsn8H/tEChrZkABY51S9dDZ9X1xKhyZf8WV/QTliv47nDmhcD4FM+GrBm+7hpazLkd1YTpHOglBIxazMFNQYc8MTiZCtGlku11LSFOOnDsuWftAQ7XRrFWrozZPELHy6I2YRlF88jVWZAWLWMKS5EoSQ05Eoks= 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=NMdYy9cD; arc=none smtp.client-ip=209.85.216.68 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="NMdYy9cD" Received: by mail-pj1-f68.google.com with SMTP id 98e67ed59e1d1-2fa345713a8so3384388a91.2 for ; Sun, 09 Feb 2025 00:13:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739088828; x=1739693628; 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=H8RQAuaZRQ5Mm3e+LwFomrAXkCycyaGq39vDIb/ueHI=; b=NMdYy9cDhNARBq49bq8b7BGCePUMw1DREZEjRRkFFwDe+d5s9AbeFXDJmO5zaiVrl9 RJXK7UnUKO5DJ36HEkHpeNNwuszt1LIQbhkaRHkz7kJ76zxTv9100vMWG/g2MsH0aM7B 2zGwdC5CCcPT33g3wnBFfWQRxOrRk6U3F5bElwW2uxgw6BAldlI1KyypsURtHcwtaNPI ldSAbxLBbBQtKpxbgt6+a/FdtFGI2gf19aODQl1o3hb72cQ6DuSJuSfl4WciAbqm2L3P FmhrnNfyLKKToOSXSdsF8C63FHogTKUBs5fBYRD78w59AiIqzBJf65KhQWH8ips4HcYL gCmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739088828; x=1739693628; 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=H8RQAuaZRQ5Mm3e+LwFomrAXkCycyaGq39vDIb/ueHI=; b=UT1eOeyBwbdyg7E6ujlB10iAX4c3clWX/f+ZOG5OlLnInOPv/HUCwYzANa5mDrWQc4 tnYWGBzb1g7suIl4UsJbbl/uzLBINiALmSiRhiCrGvOamd+xvsXKJoZx/64tderTPolq ZnKdyUl5A4L8Xbou2Pyzndr/jIgk1JY/e5t3xvrk+WpwzLnKRVxePW9hCD3VC0Ma2Jim YmlnVVipmiy9epLid/FSOBaOKFfH7vgstH0awWC656e7VP8oDf7Wa8IGRfZeUmKftybi L6QfDe+Mjc43kvsOGj1yVanvlMOBv+U9bsKLxl5hFMdopQf0qFs7CE7JbhU9aQBp0yMq keRA== X-Gm-Message-State: AOJu0YwXrvn6UKIgOKJeWkoTZzOAh1GLJ+7b0SdDw8PYOanTO5hSxB2R kraWtfa8WpISYJsnwuYkUj4wqynD3zQrHEeOvIENyJGyLBIMd2Kp X-Gm-Gg: ASbGncuub9y44o/CijLmOR3Ax3pIX7BYapat7Z/C5spsNuvdYpLWSPNz+YTRc30oVLe JIX9fV0J8jC9Jc5jeY+nhgWH3w3FeG+wn4pUaFHp8zIIgX9AE5hqaBOwv5sTvjRIafIoidJd8Rv dZAWGgAs4tb1Sl4pu1xp0G+sAiM24AOLjnPf7pItqSyXeDRenGysRT7Ep8+2Tcf9OUKWCPHYyVl SRGQa8GVOQhaJ9cpf1i2S1kenCUV/UcmKk/dnZiFjIRGzH3z1BiSGTp+wO3aVUfOybid/r2rvH5 0THQxQP20rDe7JqMNjG7vsV7T4gw+dzYHeZj+LWiqlnsX4UmRYUUZQ== X-Google-Smtp-Source: AGHT+IE4kgrUerKmXzKFHWryddI1DipvEb0nXpzj/s1y1R+ZR2OKmmwXrgStZ1DLtrwhstbXdBfzdw== X-Received: by 2002:a05:6a00:2d05:b0:725:db34:6a8c with SMTP id d2e1a72fcca58-7305d481752mr15126814b3a.13.1739088827908; Sun, 09 Feb 2025 00:13:47 -0800 (PST) Received: from Ubuntu-ROG-Strix-G512LV.. ([103.116.72.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730889e0c5fsm466308b3a.119.2025.02.09.00.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 00:13:47 -0800 (PST) From: Zejun Zhao To: jelly.zhao.42@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com, ps@pks.im Subject: [GSOC][PATCH v2 5/6] apply: use `size_t` loop counters Date: Sun, 9 Feb 2025 08:12:15 +0000 Message-ID: <20250209081216.241350-6-jelly.zhao.42@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250209081216.241350-1-jelly.zhao.42@gmail.com> References: <20250205014055.737190-1-jelly.zhao.42@gmail.com> <20250209081216.241350-1-jelly.zhao.42@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some `int` loop counters trigger -Wsign-comparison warnings. Use `size_t` loop counters. Signed-off-by: Zejun Zhao --- apply.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/apply.c b/apply.c index 72464fb6c2..585f534732 100644 --- a/apply.c +++ b/apply.c @@ -1371,12 +1371,11 @@ int parse_git_diff_header(struct strbuf *root, { "index ", gitdiff_index }, { "", gitdiff_unrecognized }, }; - int i; len = linelen(line, size); if (!len || line[len-1] != '\n') break; - for (i = 0; i < ARRAY_SIZE(optable); i++) { + for (size_t i = 0; i < ARRAY_SIZE(optable); i++) { const struct opentry *p = optable + i; int oplen = strlen(p->str); int res; @@ -2097,7 +2096,6 @@ static void add_name_limit(struct apply_state *state, static int use_patch(struct apply_state *state, struct patch *p) { const char *pathname = p->new_name ? p->new_name : p->old_name; - int i; /* Paths outside are not touched regardless of "--include" */ if (state->prefix && *state->prefix) { @@ -2107,7 +2105,7 @@ static int use_patch(struct apply_state *state, struct patch *p) } /* See if it matches any of exclude/include rule */ - for (i = 0; i < state->limit_by_name.nr; i++) { + for (size_t i = 0; i < state->limit_by_name.nr; i++) { struct string_list_item *it = &state->limit_by_name.items[i]; if (!wildmatch(it->string, pathname, 0)) return (it->util != NULL); @@ -2183,8 +2181,7 @@ static int parse_chunk(struct apply_state *state, char *buffer, unsigned long si "Files ", NULL, }; - int i; - for (i = 0; binhdr[i]; i++) { + for (size_t i = 0; binhdr[i]; i++) { size_t len = strlen(binhdr[i]); if (len < size - hd && !memcmp(binhdr[i], buffer + hd, len)) { @@ -2320,7 +2317,7 @@ static void update_pre_post_images(struct image *preimage, { struct image fixed_preimage = IMAGE_INIT; size_t insert_pos = 0; - int i, reduced; + int reduced; size_t ctx; const char *fixed; @@ -2330,7 +2327,7 @@ static void update_pre_post_images(struct image *preimage, * free "oldlines". */ image_prepare(&fixed_preimage, buf, len, 1); - for (i = 0; i < fixed_preimage.line_nr; i++) + for (size_t i = 0; i < fixed_preimage.line_nr; i++) fixed_preimage.line[i].flag = preimage->line[i].flag; image_clear(preimage); *preimage = fixed_preimage; @@ -2339,7 +2336,7 @@ static void update_pre_post_images(struct image *preimage, /* * Adjust the common context lines in postimage. */ - for (i = reduced = ctx = 0; i < postimage->line_nr; i++) { + for (size_t i = reduced = ctx = 0; i < postimage->line_nr; i++) { size_t l_len = postimage->line[i].len; if (!(postimage->line[i].flag & LINE_COMMON)) { @@ -2419,9 +2416,9 @@ static int line_by_line_fuzzy_match(struct image *img, struct image *postimage, unsigned long current, int current_lno, - int preimage_limit) + size_t preimage_limit) { - int i; + size_t i; size_t imgoff = 0; size_t preoff = 0; size_t extra_chars; @@ -2488,7 +2485,7 @@ static int match_fragment(struct apply_state *state, unsigned ws_rule, int match_beginning, int match_end) { - int i; + size_t i; const char *orig, *target; struct strbuf fixed = STRBUF_INIT; char *fixed_buf; @@ -2665,12 +2662,11 @@ static int match_fragment(struct apply_state *state, for ( ; i < preimage->line_nr; i++) { size_t fixstart = fixed.len; /* start of the fixed preimage */ size_t oldlen = preimage->line[i].len; - int j; /* Try fixing the line in the preimage */ ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL); - for (j = fixstart; j < fixed.len; j++) { + for (size_t j = fixstart; j < fixed.len; j++) { if (!isspace(fixed.buf[j])) { ret = 0; goto out; @@ -2800,7 +2796,7 @@ static void update_image(struct apply_state *state, * remove the copy of preimage at offset in img * and replace it with postimage */ - int i, nr; + int nr; size_t remove_count, insert_count, applied_at = 0; size_t result_alloc; char *result; @@ -2819,11 +2815,11 @@ static void update_image(struct apply_state *state, if (preimage_limit > img->line_nr - applied_pos) preimage_limit = img->line_nr - applied_pos; - for (i = 0; i < applied_pos; i++) + for (size_t i = 0; i < applied_pos; i++) applied_at += img->line[i].len; remove_count = 0; - for (i = 0; i < preimage_limit; i++) + for (size_t i = 0; i < preimage_limit; i++) remove_count += img->line[applied_pos + i].len; insert_count = postimage->buf.len; @@ -2852,7 +2848,7 @@ static void update_image(struct apply_state *state, img->line_nr - (applied_pos + preimage_limit)); COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->line_nr); if (!state->allow_overlap) - for (i = 0; i < postimage->line_nr; i++) + for (size_t i = 0; i < postimage->line_nr; i++) img->line[applied_pos + i].flag |= LINE_PATCHED; img->line_nr = nr; } From patchwork Sun Feb 9 08:12:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zejun Zhao X-Patchwork-Id: 13966696 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 4081313AA31 for ; Sun, 9 Feb 2025 08:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088833; cv=none; b=r6zmZZnlAV+/h59DW59lWL9rNT12LvJxM008J1NbZeorpqGxJEmkBgdAdfBaVevxCuHnYoMdsjFroRJOI61D2e5OIHOctlYcGAGZxvl5aKn3b9I803uLAiJLNJs3rRvERrWSNqwnwzeM2g94ma8wTa5MZEBTLxBxUaI4kZrUk48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739088833; c=relaxed/simple; bh=XkOGQBM+b37ZYCSzbHktoPBtt3IizJglRneCGl7MfIM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WqFVjMBYkcF4iKvrMv2h5FKKN88fuFntYIH/J3T4wpHXF6UmEDMVDrk1peswtzWHltKh6IeTAsCsSdFpUwZdyksDXjbTSKoufhoUec6RaIbCCheZwJSn+Ze3Y6lIrtRefZxeoKzm5t3Hs+2eGceNxAer9ImArCOgygQsPY76nxY= 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=NMT6gUrT; arc=none smtp.client-ip=209.85.214.194 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="NMT6gUrT" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-21f6022c2c3so22216495ad.0 for ; Sun, 09 Feb 2025 00:13:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739088831; x=1739693631; 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=Mh80cUZ8y13IDT9oSUrF9SwDfo3+8xCS4Vc83Wosju4=; b=NMT6gUrTz/pOtGZ/u6CO3HYyM3STvseO2ARLeg6ODYu86UlhyEghsii3pnwEbxIMgL galn5xzfv+i2IhctPJ9StLzwpbT355hUcX7LR1nF+JZtHFWej8GfcsGZ7H/F4mrDCeIh ngwXCKb0yNsLuzcVsRhKV/4z9QSbrH0iyBLP5F+8WrQyRrEdCN4ScSqMEd9SwO98890U TJCRZ+bWS1l2ZY04UMFC1KIQgdeNe73mRaWtmZC/OTc0xuswZJ/47jzLeeCQVf6HN1p+ 78b9myLqv71LMtc2MbHCzGybKpYXGInkQGBOEveD4MDmr0lVmnM55sa0JT7mezfGYvaB bXgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739088831; x=1739693631; 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=Mh80cUZ8y13IDT9oSUrF9SwDfo3+8xCS4Vc83Wosju4=; b=TaBEhPiRky9ie2SYZNsTPaRyZIToaSWAf25dbqQ6aiaKvaH9EHOCB5wiOnxyMQtudS i4nDT0iZVqFkm4+LU138NeaVNOKTZBWGwVbivm6KF+8kHM1SpLpZj5P6v4EN2gwrfsPj zVdkT0xX6dWEn/iYL6GjXzDZ9ZxJGxEtuyMZWCDxkzz49HJnnftA6qukcPUES7EF330S XzkgQPIq4mqeqsfTg5ikHYtYdD7x2AIylg+B05xPoY0nBYTwdL9qljCI73tQ5GKcPThh gMaYa/0Dc3qNoNWSEAsOF1kQ6cq4eZAFvXnw6Ux+3S2ZCq6C3+EjAAynFqbUnolaELK1 oEDg== X-Gm-Message-State: AOJu0YxMJ2BUgMWkNu+YLJG8Ne1JBwNJ31TdlBttn7UezZTpIh33R77Z EQS6ARjoSQFKIhwSO1dNX+Vsd7dzuRqWibbZkDN1R1LKWX0UD4Ah X-Gm-Gg: ASbGnct2S6PLak5d3n2PkDxAhsGt0JstdXH7jQ44NjPzPzQHVaFLU494NvRIfFFw9eP yiREzlDT8n8H91iX35In3uLrbm2fXDY+vTZRip8DENgckUYx/KrsmK2It1eQmGDqC09wsiL80JU Yk1uzXnhPXAW5tLlv8q/kNrB2gNHnlo67Trh7kc3q3X1sS6qfwPxtHWcO+etetudx3Z1++XOFJQ GMRFt7FqK5M5gAzuAPurI6XAcNXgjwdgsKP6fUWyKde+pUJVbl0MdAXL+EnhfEWwrC7+cpOH7ge EIBMuAAjOzDneoLV7uPQfyXJ4FQ9QiqRnajTlQmrE7NfzjgHUzLVAA== X-Google-Smtp-Source: AGHT+IGgUqVvQTab3iOJhD/0wqMQL7QHqCdB8swj6htRy0oItZ8welG838OnXRsCM05YnkLCukUGOg== X-Received: by 2002:a05:6a20:6f06:b0:1ed:d780:feaf with SMTP id adf61e73a8af0-1ee05290924mr15776440637.6.1739088831479; Sun, 09 Feb 2025 00:13:51 -0800 (PST) Received: from Ubuntu-ROG-Strix-G512LV.. ([103.116.72.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730889e0c5fsm466308b3a.119.2025.02.09.00.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 00:13:51 -0800 (PST) From: Zejun Zhao To: jelly.zhao.42@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com, ps@pks.im Subject: [GSOC][PATCH v2 6/6] apply: enable -Wsign-comparison checks Date: Sun, 9 Feb 2025 08:12:16 +0000 Message-ID: <20250209081216.241350-7-jelly.zhao.42@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250209081216.241350-1-jelly.zhao.42@gmail.com> References: <20250205014055.737190-1-jelly.zhao.42@gmail.com> <20250209081216.241350-1-jelly.zhao.42@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the `#define DISABLE_SIGN_COMPARE_WARNINGS` header line. Signed-off-by: Zejun Zhao --- apply.c | 1 - 1 file changed, 1 deletion(-) diff --git a/apply.c b/apply.c index 585f534732..51d0f4813f 100644 --- a/apply.c +++ b/apply.c @@ -8,7 +8,6 @@ */ #define USE_THE_REPOSITORY_VARIABLE -#define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" #include "abspath.h"