diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-08 11:43:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 11:43:15 -0700 |
| commit | 876e7bb3ca6d12c6794635a40f3699a5416e1672 (patch) | |
| tree | 1246d1f14f26b6dcd6bd7bcfcb31f6a42c0ee491 | |
| parent | 9fdf2a0b7e79af06bb6223f35381836cd1d2396b (diff) | |
| parent | 133d065dd6af135d53bce590f52b885c70c9a09b (diff) | |
| download | git-876e7bb3ca6d12c6794635a40f3699a5416e1672.tar.gz | |
Merge branch 'ta/bulk-checkin-signed-compare-false-warning-fix'
Compiler warnings workaround.
* ta/bulk-checkin-signed-compare-false-warning-fix:
bulk-checkin: fix sign compare warnings
| -rw-r--r-- | bulk-checkin.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 20f2da67b9..a5a3395188 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -3,7 +3,6 @@ */ #define USE_THE_REPOSITORY_VARIABLE -#define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" #include "bulk-checkin.h" @@ -56,7 +55,6 @@ static void flush_bulk_checkin_packfile(struct bulk_checkin_packfile *state) { unsigned char hash[GIT_MAX_RAWSZ]; struct strbuf packname = STRBUF_INIT; - int i; if (!state->f) return; @@ -82,7 +80,7 @@ static void flush_bulk_checkin_packfile(struct bulk_checkin_packfile *state) finish_tmp_packfile(&packname, state->pack_tmp_name, state->written, state->nr_written, &state->pack_idx_opts, hash); - for (i = 0; i < state->nr_written; i++) + for (uint32_t i = 0; i < state->nr_written; i++) free(state->written[i]); clear_exit: @@ -131,14 +129,12 @@ static void flush_batch_fsync(void) static int already_written(struct bulk_checkin_packfile *state, struct object_id *oid) { - int i; - /* The object may already exist in the repository */ if (repo_has_object_file(the_repository, oid)) return 1; /* Might want to keep the list sorted */ - for (i = 0; i < state->nr_written; i++) + for (uint32_t i = 0; i < state->nr_written; i++) if (oideq(&state->written[i]->oid, oid)) return 1; @@ -182,13 +178,13 @@ static int stream_blob_to_pack(struct bulk_checkin_packfile *state, while (status != Z_STREAM_END) { if (size && !s.avail_in) { - ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf); + size_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf); ssize_t read_result = read_in_full(fd, ibuf, rsize); if (read_result < 0) die_errno("failed to read from '%s'", path); - if (read_result != rsize) - die("failed to read %d bytes from '%s'", - (int)rsize, path); + if ((size_t)read_result != rsize) + die("failed to read %u bytes from '%s'", + (unsigned)rsize, path); offset += rsize; if (*already_hashed_to < offset) { size_t hsize = offset - *already_hashed_to; |