From: Philip Oakley <philipoakley@iee.email>
To: Derrick Stolee <stolee@gmail.com>, GitList <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Cc: "René Scharfe" <l.s.r@web.de>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 3/4] diffcore-delta.c: LLP64 compatibility, upcast unity for left shift
Date: Mon, 29 Nov 2021 23:50:03 +0000 [thread overview]
Message-ID: <833261c1-2369-92bc-3c97-5e548e52cf01@iee.email> (raw)
In-Reply-To: <f721bc99-6d79-e2f2-7810-dd77b777161f@gmail.com>
On 29/11/2021 14:44, Derrick Stolee wrote:
> On 11/26/2021 6:36 AM, Philip Oakley wrote:
>> Visual Studio reports C4334 "was 64-bit shift intended" warning
>> because of size miss-match.
>>
>> Promote unity to the matching type to fit with its subsequent operation.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.email>
>> ---
>> diffcore-delta.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/diffcore-delta.c b/diffcore-delta.c
>> index 5668ace60d..a4e86dfa38 100644
>> --- a/diffcore-delta.c
>> +++ b/diffcore-delta.c
>> @@ -133,10 +133,10 @@ static struct spanhash_top *hash_chars(struct repository *r,
>>
>> i = INITIAL_HASH_SIZE;
>> hash = xmalloc(st_add(sizeof(*hash),
>> - st_mult(sizeof(struct spanhash), 1<<i)));
>> + st_mult(sizeof(struct spanhash), (size_t)1<<i)));
> This could use spaces around "<<"
OK.
>
>> hash->alloc_log2 = i;
>> hash->free = INITIAL_FREE(i);
>> - memset(hash->data, 0, sizeof(struct spanhash) * (1<<i));
>> + memset(hash->data, 0, sizeof(struct spanhash) * ((size_t)1 << i));
> Especially because you correctly add them here.
True. The spacing isn't that consistent in the code base, but adding the
spaces here does look better.
>
> Thanks,
> -Stolee
Philip
next prev parent reply other threads:[~2021-11-29 23:50 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
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 [this message]
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=833261c1-2369-92bc-3c97-5e548e52cf01@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 \
--cc=stolee@gmail.com \
/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).