mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Fix some warnings (on cygwin) to allow -Werror
When printing valuds of type uint32_t, we should use PRIu32, and should not assume that it is unsigned int. On 32-bit platforms, it could be defined as unsigned long. The same caution applies to ntohl(). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
db5d6666af
commit
6e1c23442a
|
@ -116,7 +116,7 @@ static void handle_object(const unsigned char *sha1)
|
|||
|
||||
mark_next_object(object);
|
||||
|
||||
printf("blob\nmark :%d\ndata %lu\n", last_idnum, size);
|
||||
printf("blob\nmark :%"PRIu32"\ndata %lu\n", last_idnum, size);
|
||||
if (size && fwrite(buf, size, 1, stdout) != 1)
|
||||
die ("Could not write blob %s", sha1_to_hex(sha1));
|
||||
printf("\n");
|
||||
|
@ -204,7 +204,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
|
|||
reencoded = reencode_string(message, "UTF-8", encoding);
|
||||
if (!commit->parents)
|
||||
printf("reset %s\n", (const char*)commit->util);
|
||||
printf("commit %s\nmark :%d\n%.*s\n%.*s\ndata %u\n%s",
|
||||
printf("commit %s\nmark :%"PRIu32"\n%.*s\n%.*s\ndata %u\n%s",
|
||||
(const char *)commit->util, last_idnum,
|
||||
(int)(author_end - author), author,
|
||||
(int)(committer_end - committer), committer,
|
||||
|
|
|
@ -520,7 +520,8 @@ static int get_pack(int xd[2], char **pack_lockfile)
|
|||
|
||||
if (read_pack_header(demux.out, &header))
|
||||
die("protocol error: bad pack header");
|
||||
snprintf(hdr_arg, sizeof(hdr_arg), "--pack_header=%u,%u",
|
||||
snprintf(hdr_arg, sizeof(hdr_arg),
|
||||
"--pack_header=%"PRIu32",%"PRIu32,
|
||||
ntohl(header.hdr_version), ntohl(header.hdr_entries));
|
||||
if (ntohl(header.hdr_entries) < unpack_limit)
|
||||
do_keep = 0;
|
||||
|
|
|
@ -568,7 +568,8 @@ static void write_pack_file(void)
|
|||
free(written_list);
|
||||
stop_progress(&progress_state);
|
||||
if (written != nr_result)
|
||||
die("wrote %u objects while expecting %u", written, nr_result);
|
||||
die("wrote %"PRIu32" objects while expecting %"PRIu32,
|
||||
written, nr_result);
|
||||
/*
|
||||
* We have scanned through [0 ... i). Since we have written
|
||||
* the correct number of objects, the remaining [i ... nr_objects)
|
||||
|
@ -580,7 +581,8 @@ static void write_pack_file(void)
|
|||
j += !e->idx.offset && !e->preferred_base;
|
||||
}
|
||||
if (j)
|
||||
die("wrote %u objects as expected but %u unwritten", written, j);
|
||||
die("wrote %"PRIu32" objects as expected but %"PRIu32
|
||||
" unwritten", written, j);
|
||||
}
|
||||
|
||||
static int locate_object_entry_hash(const unsigned char *sha1)
|
||||
|
@ -1694,7 +1696,8 @@ static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, vo
|
|||
static void prepare_pack(int window, int depth)
|
||||
{
|
||||
struct object_entry **delta_list;
|
||||
uint32_t i, n, nr_deltas;
|
||||
uint32_t i, nr_deltas;
|
||||
unsigned n;
|
||||
|
||||
get_object_details();
|
||||
|
||||
|
@ -1785,7 +1788,8 @@ static int git_pack_config(const char *k, const char *v, void *cb)
|
|||
if (!strcmp(k, "pack.indexversion")) {
|
||||
pack_idx_default_version = git_config_int(k, v);
|
||||
if (pack_idx_default_version > 2)
|
||||
die("bad pack.indexversion=%d", pack_idx_default_version);
|
||||
die("bad pack.indexversion=%"PRIu32,
|
||||
pack_idx_default_version);
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "pack.packsizelimit")) {
|
||||
|
@ -2219,7 +2223,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
|
|||
prepare_pack(window, depth);
|
||||
write_pack_file();
|
||||
if (progress)
|
||||
fprintf(stderr, "Total %u (delta %u), reused %u (delta %u)\n",
|
||||
fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
|
||||
" reused %"PRIu32" (delta %"PRIu32")\n",
|
||||
written, written_delta, reused, reused_delta);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -471,7 +471,8 @@ static void unpack_all(void)
|
|||
if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE)
|
||||
die("bad pack file");
|
||||
if (!pack_version_ok(hdr->hdr_version))
|
||||
die("unknown pack file version %d", ntohl(hdr->hdr_version));
|
||||
die("unknown pack file version %"PRIu32,
|
||||
ntohl(hdr->hdr_version));
|
||||
use(sizeof(struct pack_header));
|
||||
|
||||
if (!quiet)
|
||||
|
|
|
@ -46,11 +46,11 @@ static void show_pack_info(struct packed_git *p)
|
|||
for (i = 0; i <= MAX_CHAIN; i++) {
|
||||
if (!chain_histogram[i])
|
||||
continue;
|
||||
printf("chain length = %d: %d object%s\n", i,
|
||||
printf("chain length = %"PRIu32": %"PRIu32" object%s\n", i,
|
||||
chain_histogram[i], chain_histogram[i] > 1 ? "s" : "");
|
||||
}
|
||||
if (chain_histogram[0])
|
||||
printf("chain length > %d: %d object%s\n", MAX_CHAIN,
|
||||
printf("chain length > %d: %"PRIu32" object%s\n", MAX_CHAIN,
|
||||
chain_histogram[0], chain_histogram[0] > 1 ? "s" : "");
|
||||
}
|
||||
|
||||
|
|
|
@ -190,7 +190,8 @@ static void parse_pack_header(void)
|
|||
if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
|
||||
die("pack signature mismatch");
|
||||
if (!pack_version_ok(hdr->hdr_version))
|
||||
die("pack version %d unsupported", ntohl(hdr->hdr_version));
|
||||
die("pack version %"PRIu32" unsupported",
|
||||
ntohl(hdr->hdr_version));
|
||||
|
||||
nr_objects = ntohl(hdr->hdr_entries);
|
||||
use(sizeof(struct pack_header));
|
||||
|
@ -771,7 +772,8 @@ static int git_index_pack_config(const char *k, const char *v, void *cb)
|
|||
if (!strcmp(k, "pack.indexversion")) {
|
||||
pack_idx_default_version = git_config_int(k, v);
|
||||
if (pack_idx_default_version > 2)
|
||||
die("bad pack.indexversion=%d", pack_idx_default_version);
|
||||
die("bad pack.indexversion=%"PRIu32,
|
||||
pack_idx_default_version);
|
||||
return 0;
|
||||
}
|
||||
return git_default_config(k, v, cb);
|
||||
|
|
|
@ -370,7 +370,8 @@ static const char *unpack(void)
|
|||
hdr_err = parse_pack_header(&hdr);
|
||||
if (hdr_err)
|
||||
return hdr_err;
|
||||
snprintf(hdr_arg, sizeof(hdr_arg), "--pack_header=%u,%u",
|
||||
snprintf(hdr_arg, sizeof(hdr_arg),
|
||||
"--pack_header=%"PRIu32",%"PRIu32,
|
||||
ntohl(hdr.hdr_version), ntohl(hdr.hdr_entries));
|
||||
|
||||
if (ntohl(hdr.hdr_entries) < unpack_limit) {
|
||||
|
|
12
sha1_file.c
12
sha1_file.c
|
@ -484,7 +484,7 @@ static int check_packed_git_idx(const char *path, struct packed_git *p)
|
|||
version = ntohl(hdr->idx_version);
|
||||
if (version < 2 || version > 2) {
|
||||
munmap(idx_map, idx_size);
|
||||
return error("index file %s is version %d"
|
||||
return error("index file %s is version %"PRIu32
|
||||
" and is not supported by this binary"
|
||||
" (try upgrading GIT to a newer version)",
|
||||
path, version);
|
||||
|
@ -695,14 +695,14 @@ static int open_packed_git_1(struct packed_git *p)
|
|||
if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
|
||||
return error("file %s is not a GIT packfile", p->pack_name);
|
||||
if (!pack_version_ok(hdr.hdr_version))
|
||||
return error("packfile %s is version %u and not supported"
|
||||
" (try upgrading GIT to a newer version)",
|
||||
return error("packfile %s is version %"PRIu32" and not"
|
||||
" supported (try upgrading GIT to a newer version)",
|
||||
p->pack_name, ntohl(hdr.hdr_version));
|
||||
|
||||
/* Verify the pack matches its index. */
|
||||
if (p->num_objects != ntohl(hdr.hdr_entries))
|
||||
return error("packfile %s claims to have %u objects"
|
||||
" while index indicates %u objects",
|
||||
return error("packfile %s claims to have %"PRIu32" objects"
|
||||
" while index indicates %"PRIu32" objects",
|
||||
p->pack_name, ntohl(hdr.hdr_entries),
|
||||
p->num_objects);
|
||||
if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
|
||||
|
@ -1769,7 +1769,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
|
|||
}
|
||||
|
||||
if (debug_lookup)
|
||||
printf("%02x%02x%02x... lo %u hi %u nr %u\n",
|
||||
printf("%02x%02x%02x... lo %u hi %u nr %"PRIu32"\n",
|
||||
sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
|
||||
|
||||
if (use_lookup < 0)
|
||||
|
|
|
@ -68,7 +68,8 @@ int main(int argc, char **argv)
|
|||
ntohl(off64[1]);
|
||||
off64_nr++;
|
||||
}
|
||||
printf("%" PRIuMAX " %s (%08x)\n", (uintmax_t) offset,
|
||||
printf("%" PRIuMAX " %s (%08"PRIx32")\n",
|
||||
(uintmax_t) offset,
|
||||
sha1_to_hex(entries[i].sha1),
|
||||
ntohl(entries[i].crc));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue