From: Philip Oakley <philipoakley@iee.email>
To: "René Scharfe" <l.s.r@web.de>, GitList <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 1/4] mergesort.c: LLP64 compatibility, upcast unity for left shift
Date: Mon, 29 Nov 2021 23:49:04 +0000 [thread overview]
Message-ID: <384f10ca-81c5-dd89-b66c-6e49d7f23f70@iee.email> (raw)
In-Reply-To: <9c3d6d3c-1f3b-f51c-6856-b5ced44a8f4b@web.de>
On 27/11/2021 07:32, René Scharfe wrote:
> Am 26.11.21 um 12:36 schrieb Philip Oakley:
>> Visual Studio reports C4334 "was 64-bit shift intended" size mismatch
>> warning because of size miss-match.
>>
>> Promote unity to the matching type to fit with the `&` operator.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.email>
>>
>> ---
>> This is the same fix that René Scharfe provided in 42c456ff81
>> (mergesort: avoid left shift overflow, 2021-11-16)
>>
>> Use size_t to match n when building the bitmask for checking whether a
>> rank is occupied, instead of the default signed int.
> Fine with me -- it's just nicer to take the whole set.
>
> René
Thanks, I'm happy either way if others feels it belongs better with your
mergesort series.
>
>> ---
>> mergesort.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/mergesort.c b/mergesort.c
>> index 6216835566..bd9c6ef8ee 100644
>> --- a/mergesort.c
>> +++ b/mergesort.c
>> @@ -63,7 +63,7 @@ void *llist_mergesort(void *list,
>> void *next = get_next_fn(list);
>> if (next)
>> set_next_fn(list, NULL);
>> - for (i = 0; n & (1 << i); i++)
>> + for (i = 0; n & ((size_t)1 << i); i++)
>> list = llist_merge(ranks[i], list, get_next_fn,
>> set_next_fn, compare_fn);
>> n++;
>>
Philip
next prev parent reply other threads:[~2021-11-29 23:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 11:36 [PATCH 0/4] Fix LLP64 `(size_t)1` compatibility VS C4334 warnings Philip Oakley
2021-11-26 11:36 ` [PATCH 1/4] mergesort.c: LLP64 compatibility, upcast unity for left shift Philip Oakley
2021-11-27 7:32 ` René Scharfe
2021-11-29 23:49 ` Philip Oakley [this message]
2021-11-26 11:36 ` [PATCH 2/4] repack.c: " Philip Oakley
2021-11-30 0:35 ` Taylor Blau
2021-11-30 22:28 ` Philip Oakley
2021-11-26 11:36 ` [PATCH 3/4] diffcore-delta.c: " Philip Oakley
2021-11-29 14:44 ` Derrick Stolee
2021-11-29 23:50 ` Philip Oakley
2021-11-26 11:36 ` [PATCH 4/4] object-file.c: " Philip Oakley
2021-11-29 14:44 ` [PATCH 0/4] Fix LLP64 `(size_t)1` compatibility VS C4334 warnings Derrick Stolee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=384f10ca-81c5-dd89-b66c-6e49d7f23f70@iee.email \
--to=philipoakley@iee.email \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).