mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-07 23:19:28 +00:00
MSVC: Fix some compiler warnings
In particular, using the normal (or production) compiler warning level (-W3), msvc complains as follows: .../sha1.c(244) : warning C4018: '<' : signed/unsigned mismatch .../sha1.c(270) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data .../sha1.c(271) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data Note that gcc issues a similar complaint about line 244 when compiling with -Wextra. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
This commit is contained in:
parent
e2337f39c3
commit
e272b10388
@ -234,13 +234,13 @@ void blk_SHA1_Init(blk_SHA_CTX *ctx)
|
|||||||
|
|
||||||
void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
|
void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
|
||||||
{
|
{
|
||||||
int lenW = ctx->size & 63;
|
unsigned int lenW = ctx->size & 63;
|
||||||
|
|
||||||
ctx->size += len;
|
ctx->size += len;
|
||||||
|
|
||||||
/* Read the data into W and process blocks as they get full */
|
/* Read the data into W and process blocks as they get full */
|
||||||
if (lenW) {
|
if (lenW) {
|
||||||
int left = 64 - lenW;
|
unsigned int left = 64 - lenW;
|
||||||
if (len < left)
|
if (len < left)
|
||||||
left = len;
|
left = len;
|
||||||
memcpy(lenW + (char *)ctx->W, data, left);
|
memcpy(lenW + (char *)ctx->W, data, left);
|
||||||
@ -267,8 +267,8 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Pad with a binary 1 (ie 0x80), then zeroes, then length */
|
/* Pad with a binary 1 (ie 0x80), then zeroes, then length */
|
||||||
padlen[0] = htonl(ctx->size >> 29);
|
padlen[0] = htonl((uint32_t)(ctx->size >> 29));
|
||||||
padlen[1] = htonl(ctx->size << 3);
|
padlen[1] = htonl((uint32_t)(ctx->size << 3));
|
||||||
|
|
||||||
i = ctx->size & 63;
|
i = ctx->size & 63;
|
||||||
blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));
|
blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));
|
||||||
|
Loading…
Reference in New Issue
Block a user