string-list API: change "nr" and "alloc" to "size_t"
Change the "nr" and "alloc" members of "struct string_list" to use "size_t" instead of "nr". On some platforms the size of an "unsigned int" will be smaller than a "size_t", e.g. a 32 bit unsigned v.s. 64 bit unsigned. As "struct string_list" is a generic API we use in a lot of places this might cause overflows. As one example: code in "refs.c" keeps track of the number of refs with a "size_t", and auxiliary code in builtin/remote.c in get_ref_states() appends those to a "struct string_list". While we're at it split the "nr" and "alloc" in string-list.h across two lines, which is the case for most such struct member declarations (e.g. in "strbuf.h" and "strvec.h"). Changing e.g. "int i" to "size_t i" in run_and_feed_hook() isn't strictly necessary, and there are a lot more cases where we'll use a local "int", "unsigned int" etc. variable derived from the "nr" in the "struct string_list". But in that case as well as add_wrapped_shortlog_msg() in builtin/shortlog.c we need to adjust the printf format referring to "nr" anyway, so let's also change the other variables referring to it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
6f69325258
commit
99d60545f8
8
bundle.c
8
bundle.c
@ -255,18 +255,18 @@ int verify_bundle(struct repository *r,
|
||||
|
||||
r = &header->references;
|
||||
printf_ln(Q_("The bundle contains this ref:",
|
||||
"The bundle contains these %d refs:",
|
||||
"The bundle contains these %"PRIuMAX" refs:",
|
||||
r->nr),
|
||||
r->nr);
|
||||
(uintmax_t)r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
r = &header->prerequisites;
|
||||
if (!r->nr) {
|
||||
printf_ln(_("The bundle records a complete history."));
|
||||
} else {
|
||||
printf_ln(Q_("The bundle requires this ref:",
|
||||
"The bundle requires these %d refs:",
|
||||
"The bundle requires these %"PRIuMAX" refs:",
|
||||
r->nr),
|
||||
r->nr);
|
||||
(uintmax_t)r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user