mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-05 15:33:51 +00:00
Fix warning on win64
This commit is contained in:
parent
ab44c62e54
commit
3343b5ffd3
@ -632,7 +632,8 @@ static int inject_object(git_indexer_stream *idx, git_oid *id)
|
||||
git_buf buf = GIT_BUF_INIT;
|
||||
git_off_t entry_start;
|
||||
const void *data;
|
||||
size_t len, hdr_len;
|
||||
size_t len;
|
||||
int hdr_len;
|
||||
int error;
|
||||
|
||||
entry = git__calloc(1, sizeof(*entry));
|
||||
@ -660,7 +661,7 @@ static int inject_object(git_indexer_stream *idx, git_oid *id)
|
||||
/* And then the compressed object */
|
||||
git_filebuf_write(&idx->pack_file, buf.ptr, buf.size);
|
||||
idx->pack->mwf.size += buf.size;
|
||||
entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, buf.size));
|
||||
entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, (uInt)buf.size));
|
||||
git_buf_free(&buf);
|
||||
|
||||
/* Write a fake trailer so the pack functions play ball */
|
||||
|
@ -26,7 +26,7 @@ struct unpacked {
|
||||
git_pobject *object;
|
||||
void *data;
|
||||
struct git_delta_index *index;
|
||||
unsigned int depth;
|
||||
int depth;
|
||||
};
|
||||
|
||||
struct tree_walk_context {
|
||||
@ -659,7 +659,7 @@ static int delta_cacheable(git_packbuilder *pb, unsigned long src_size,
|
||||
}
|
||||
|
||||
static int try_delta(git_packbuilder *pb, struct unpacked *trg,
|
||||
struct unpacked *src, unsigned int max_depth,
|
||||
struct unpacked *src, int max_depth,
|
||||
unsigned long *mem_usage, int *ret)
|
||||
{
|
||||
git_pobject *trg_object = trg->object;
|
||||
|
@ -372,7 +372,7 @@ static unsigned char *pack_window_open(
|
||||
* - each byte afterwards: low seven bits are size continuation,
|
||||
* with the high bit being "size continues"
|
||||
*/
|
||||
int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otype type)
|
||||
int git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type)
|
||||
{
|
||||
unsigned char *hdr_base;
|
||||
unsigned char c;
|
||||
|
@ -112,7 +112,7 @@ typedef struct git_packfile_stream {
|
||||
git_mwindow *mw;
|
||||
} git_packfile_stream;
|
||||
|
||||
int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otype type);
|
||||
int git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type);
|
||||
|
||||
int git_packfile_unpack_header(
|
||||
size_t *size_p,
|
||||
|
Loading…
Reference in New Issue
Block a user