зеркало из https://github.com/microsoft/git.git
Merge branch 'ab/string-list-count-in-size-t'
Count string_list items in size_t, not "unsigned int". * ab/string-list-count-in-size-t: string-list API: change "nr" and "alloc" to "size_t" gettext API users: don't explicitly cast ngettext()'s "n"
This commit is contained in:
Junio C Hamano
Коммит
38bbb9e990
|
|
@ -582,7 +582,7 @@ static void *unpack_data(struct object_entry *obj,
|
|||
if (!n)
|
||||
die(Q_("premature end of pack file, %"PRIuMAX" byte missing",
|
||||
"premature end of pack file, %"PRIuMAX" bytes missing",
|
||||
(unsigned int)len),
|
||||
len),
|
||||
(uintmax_t)len);
|
||||
from += n;
|
||||
len -= n;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
|
|||
"Ignoring %s.",
|
||||
"cannot handle more than %d bases. "
|
||||
"Ignoring %s.",
|
||||
(int)ARRAY_SIZE(bases)-1),
|
||||
ARRAY_SIZE(bases)-1),
|
||||
(int)ARRAY_SIZE(bases)-1, argv[i]);
|
||||
}
|
||||
if (argc - i != 3) /* "--" "<head>" "<remote>" */
|
||||
|
|
|
|||
|
|
@ -813,13 +813,14 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
|
|||
proc.trace2_hook_name = hook_name;
|
||||
|
||||
if (feed_state->push_options) {
|
||||
int i;
|
||||
size_t i;
|
||||
for (i = 0; i < feed_state->push_options->nr; i++)
|
||||
strvec_pushf(&proc.env_array,
|
||||
"GIT_PUSH_OPTION_%d=%s", i,
|
||||
"GIT_PUSH_OPTION_%"PRIuMAX"=%s",
|
||||
(uintmax_t)i,
|
||||
feed_state->push_options->items[i].string);
|
||||
strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d",
|
||||
feed_state->push_options->nr);
|
||||
strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%"PRIuMAX"",
|
||||
(uintmax_t)feed_state->push_options->nr);
|
||||
} else
|
||||
strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
|
||||
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
|
|||
|
||||
void shortlog_output(struct shortlog *log)
|
||||
{
|
||||
int i, j;
|
||||
size_t i, j;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
if (log->sort_by_number)
|
||||
|
|
@ -448,10 +448,10 @@ void shortlog_output(struct shortlog *log)
|
|||
(int)UTIL_TO_INT(item), item->string);
|
||||
} else {
|
||||
struct string_list *onelines = item->util;
|
||||
fprintf(log->file, "%s (%d):\n",
|
||||
item->string, onelines->nr);
|
||||
for (j = onelines->nr - 1; j >= 0; j--) {
|
||||
const char *msg = onelines->items[j].string;
|
||||
fprintf(log->file, "%s (%"PRIuMAX"):\n",
|
||||
item->string, (uintmax_t)onelines->nr);
|
||||
for (j = onelines->nr; j >= 1; j--) {
|
||||
const char *msg = onelines->items[j - 1].string;
|
||||
|
||||
if (log->wrap_lines) {
|
||||
strbuf_reset(&sb);
|
||||
|
|
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1698,10 +1698,10 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
|
|||
dirlen = packname.len;
|
||||
if (ctx->report_progress) {
|
||||
strbuf_addf(&progress_title,
|
||||
Q_("Finding commits for commit graph in %d pack",
|
||||
"Finding commits for commit graph in %d packs",
|
||||
Q_("Finding commits for commit graph in %"PRIuMAX" pack",
|
||||
"Finding commits for commit graph in %"PRIuMAX" packs",
|
||||
pack_indexes->nr),
|
||||
pack_indexes->nr);
|
||||
(uintmax_t)pack_indexes->nr);
|
||||
ctx->progress = start_delayed_progress(progress_title.buf, 0);
|
||||
ctx->progress_done = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ static void free_mailmap_info(void *p, const char *s)
|
|||
static void free_mailmap_entry(void *p, const char *s)
|
||||
{
|
||||
struct mailmap_entry *me = (struct mailmap_entry *)p;
|
||||
debug_mm("mailmap: removing entries for <%s>, with %d sub-entries\n",
|
||||
s, me->namemap.nr);
|
||||
debug_mm("mailmap: removing entries for <%s>, with %"PRIuMAX" sub-entries\n",
|
||||
s, (uintmax_t)me->namemap.nr);
|
||||
debug_mm("mailmap: - simple: '%s' <%s>\n",
|
||||
debug_str(me->name), debug_str(me->email));
|
||||
|
||||
|
|
@ -250,7 +250,8 @@ int read_mailmap(struct string_list *map)
|
|||
|
||||
void clear_mailmap(struct string_list *map)
|
||||
{
|
||||
debug_mm("mailmap: clearing %d entries...\n", map->nr);
|
||||
debug_mm("mailmap: clearing %"PRIuMAX" entries...\n",
|
||||
(uintmax_t)map->nr);
|
||||
map->strdup_strings = 1;
|
||||
string_list_clear_func(map, free_mailmap_entry);
|
||||
debug_mm("mailmap: cleared\n");
|
||||
|
|
|
|||
|
|
@ -4064,8 +4064,8 @@ static void process_entries(struct merge_options *opt,
|
|||
trace2_region_enter("merge", "process_entries cleanup", opt->repo);
|
||||
if (dir_metadata.offsets.nr != 1 ||
|
||||
(uintptr_t)dir_metadata.offsets.items[0].util != 0) {
|
||||
printf("dir_metadata.offsets.nr = %d (should be 1)\n",
|
||||
dir_metadata.offsets.nr);
|
||||
printf("dir_metadata.offsets.nr = %"PRIuMAX" (should be 1)\n",
|
||||
(uintmax_t)dir_metadata.offsets.nr);
|
||||
printf("dir_metadata.offsets.items[0].util = %u (should be 0)\n",
|
||||
(unsigned)(uintptr_t)dir_metadata.offsets.items[0].util);
|
||||
fflush(stdout);
|
||||
|
|
|
|||
4
strbuf.c
4
strbuf.c
|
|
@ -875,9 +875,9 @@ static void strbuf_humanise(struct strbuf *buf, off_t bytes,
|
|||
strbuf_addf(buf,
|
||||
humanise_rate == 0 ?
|
||||
/* TRANSLATORS: IEC 80000-13:2008 byte */
|
||||
Q_("%u byte", "%u bytes", (unsigned)bytes) :
|
||||
Q_("%u byte", "%u bytes", bytes) :
|
||||
/* TRANSLATORS: IEC 80000-13:2008 byte/second */
|
||||
Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),
|
||||
Q_("%u byte/s", "%u bytes/s", bytes),
|
||||
(unsigned)bytes);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,8 @@ typedef int (*compare_strings_fn)(const char *, const char *);
|
|||
*/
|
||||
struct string_list {
|
||||
struct string_list_item *items;
|
||||
unsigned int nr, alloc;
|
||||
size_t nr;
|
||||
size_t alloc;
|
||||
unsigned int strdup_strings:1;
|
||||
compare_strings_fn cmp; /* NULL uses strcmp() */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -180,15 +180,16 @@ static int testsuite(int argc, const char **argv)
|
|||
if (max_jobs > suite.tests.nr)
|
||||
max_jobs = suite.tests.nr;
|
||||
|
||||
fprintf(stderr, "Running %d tests (%d at a time)\n",
|
||||
suite.tests.nr, max_jobs);
|
||||
fprintf(stderr, "Running %"PRIuMAX" tests (%d at a time)\n",
|
||||
(uintmax_t)suite.tests.nr, max_jobs);
|
||||
|
||||
ret = run_processes_parallel(max_jobs, next_test, test_failed,
|
||||
test_finished, &suite);
|
||||
|
||||
if (suite.failed.nr > 0) {
|
||||
ret = 1;
|
||||
fprintf(stderr, "%d tests failed:\n\n", suite.failed.nr);
|
||||
fprintf(stderr, "%"PRIuMAX" tests failed:\n\n",
|
||||
(uintmax_t)suite.failed.nr);
|
||||
for (i = 0; i < suite.failed.nr; i++)
|
||||
fprintf(stderr, "\t%s\n", suite.failed.items[i].string);
|
||||
}
|
||||
|
|
|
|||
12
wt-status.c
12
wt-status.c
|
|
@ -1383,10 +1383,10 @@ static void show_rebase_information(struct wt_status *s,
|
|||
status_printf_ln(s, color, _("No commands done."));
|
||||
else {
|
||||
status_printf_ln(s, color,
|
||||
Q_("Last command done (%d command done):",
|
||||
"Last commands done (%d commands done):",
|
||||
Q_("Last command done (%"PRIuMAX" command done):",
|
||||
"Last commands done (%"PRIuMAX" commands done):",
|
||||
have_done.nr),
|
||||
have_done.nr);
|
||||
(uintmax_t)have_done.nr);
|
||||
for (i = (have_done.nr > nr_lines_to_show)
|
||||
? have_done.nr - nr_lines_to_show : 0;
|
||||
i < have_done.nr;
|
||||
|
|
@ -1402,10 +1402,10 @@ static void show_rebase_information(struct wt_status *s,
|
|||
_("No commands remaining."));
|
||||
else {
|
||||
status_printf_ln(s, color,
|
||||
Q_("Next command to do (%d remaining command):",
|
||||
"Next commands to do (%d remaining commands):",
|
||||
Q_("Next command to do (%"PRIuMAX" remaining command):",
|
||||
"Next commands to do (%"PRIuMAX" remaining commands):",
|
||||
yet_to_do.nr),
|
||||
yet_to_do.nr);
|
||||
(uintmax_t)yet_to_do.nr);
|
||||
for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
|
||||
status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
|
||||
if (s->hints)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче