gettext API users: don't explicitly cast ngettext()'s "n"

avar · gitster · commit 6f69325258da · 2022-03-07T11:57:52.000-08:00
Change a few stray users of the inline gettext.h Q_() function to stop casting its "n" argument, the vast majority of the users of that wrapper API use the implicit cast to "unsigned long". The ngettext() function (which Q_() resolves to) takes an "unsigned long int", and so does our Q_() wrapper for it, see 0c9ea33 (i18n: add stub Q_() wrapper for ngettext, 2011-03-09). The function isn't ours, but provided by e.g. GNU libintl. This amends code added in added in 7171a0b (index-pack: correct "len" type in unpack_data(), 2016-07-13). The cast it added for the printf format to die() was needed, but not the cast to Q_(). Likewise the casts in strbuf.c added in 8f354a1 (l10n: localizable upload progress messages, 2019-07-02) and for builtin/merge-recursive.c in ccf7813 (i18n: merge-recursive: mark error messages for translation, 2016-09-15) weren't needed. In the latter case the cast was copy/pasted from the argument to warning() itself, added in b74d779 (MinGW: Fix compiler warning in merge-recursive, 2009-05-23). The cast for warning() is needed, but not the one for ngettext()'s "n" argument. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -583,7 +583,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;
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
@@ -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>" */
diff --git a/strbuf.c b/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);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ int cmd_merge_recursive(int argc, const char *argv, const char prefix)`
`58`	`58`	`"Ignoring %s.",`
`59`	`59`	`"cannot handle more than %d bases. "`
`60`	`60`	`"Ignoring %s.",`
`61`		`- (int)ARRAY_SIZE(bases)-1),`
	`61`	`+ ARRAY_SIZE(bases)-1),`
`62`	`62`	`(int)ARRAY_SIZE(bases)-1, argv[i]);`
`63`	`63`	`}`
`64`	`64`	`if (argc - i != 3) /* "--" "<head>" "<remote>" */`
Original file line number	Diff line number	Diff line change
`@@ -875,9 +875,9 @@ static void strbuf_humanise(struct strbuf *buf, off_t bytes,`
`875`	`875`	`strbuf_addf(buf,`
`876`	`876`	`humanise_rate == 0 ?`
`877`	`877`	`/* TRANSLATORS: IEC 80000-13:2008 byte */`
`878`		`- Q_("%u byte", "%u bytes", (unsigned)bytes) :`
	`878`	`+ Q_("%u byte", "%u bytes", bytes) :`
`879`	`879`	`/* TRANSLATORS: IEC 80000-13:2008 byte/second */`
`880`		`- Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),`
	`880`	`+ Q_("%u byte/s", "%u bytes/s", bytes),`
`881`	`881`	`(unsigned)bytes);`
`882`	`882`	`}`
`883`	`883`	`}`