*.c static functions: don't forward-declare __attribute__

avar · gitster · commit 103e02c7001f · 2021-07-12T12:09:53.000-07:00
9cf6d33 (Add git-index-pack utility, 2005-10-12) and 466dbc4 (receive-pack: Send internal errors over side-band #2, 2010-02-10) we added these static functions and forward-declared their __attribute__((printf)). I think this may have been to work around some compiler limitation at the time, but in any case we have a lot of code that uses the briefer way of declaring these that I'm using here, so if we had any such issues with compilers we'd have seen them already. 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
@@ -369,9 +369,7 @@ static void parse_pack_header(void)
 	use(sizeof(struct pack_header));
 }
 
-static NORETURN void bad_object(off_t offset, const char *format,
-		       ...) __attribute__((format (printf, 2, 3)));
-
+__attribute__((format (printf, 2, 3)))
 static NORETURN void bad_object(off_t offset, const char *format, ...)
 {
 	va_list params;
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
@@ -425,9 +425,6 @@ static int proc_receive_ref_matches(struct command *cmd)
 	return 0;
 }
 
-static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2)));
-static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
-
 static void report_message(const char *prefix, const char *err, va_list params)
 {
 	int sz;
@@ -445,6 +442,7 @@ static void report_message(const char *prefix, const char *err, va_list params)
 		xwrite(2, msg, sz);
 }
 
+__attribute__((format (printf, 1, 2)))
 static void rp_warning(const char *err, ...)
 {
 	va_list params;
@@ -453,6 +451,7 @@ static void rp_warning(const char *err, ...)
 	va_end(params);
 }
 
+__attribute__((format (printf, 1, 2)))
 static void rp_error(const char *err, ...)
 {
 	va_list params;

Original file line number	Diff line number	Diff line change
`@@ -369,9 +369,7 @@ static void parse_pack_header(void)`
`369`	`369`	`use(sizeof(struct pack_header));`
`370`	`370`	`}`
`371`	`371`
`372`		`-static NORETURN void bad_object(off_t offset, const char *format,`
`373`		`- ...) __attribute__((format (printf, 2, 3)));`
`374`		`-`
	`372`	`+__attribute__((format (printf, 2, 3)))`
`375`	`373`	`static NORETURN void bad_object(off_t offset, const char *format, ...)`
`376`	`374`	`{`
`377`	`375`	`va_list params;`
Original file line number	Diff line number	Diff line change
`@@ -425,9 +425,6 @@ static int proc_receive_ref_matches(struct command *cmd)`
`425`	`425`	`return 0;`
`426`	`426`	`}`
`427`	`427`
`428`		`-static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2)));`
`429`		`-static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2)));`
`430`		`-`
`431`	`428`	`static void report_message(const char prefix, const char err, va_list params)`
`432`	`429`	`{`
`433`	`430`	`int sz;`
`@@ -445,6 +442,7 @@ static void report_message(const char prefix, const char err, va_list params)`
`445`	`442`	`xwrite(2, msg, sz);`
`446`	`443`	`}`
`447`	`444`
	`445`	`+__attribute__((format (printf, 1, 2)))`
`448`	`446`	`static void rp_warning(const char *err, ...)`
`449`	`447`	`{`
`450`	`448`	`va_list params;`
`@@ -453,6 +451,7 @@ static void rp_warning(const char *err, ...)`
`453`	`451`	`va_end(params);`
`454`	`452`	`}`
`455`	`453`
	`454`	`+__attribute__((format (printf, 1, 2)))`
`456`	`455`	`static void rp_error(const char *err, ...)`
`457`	`456`	`{`
`458`	`457`	`va_list params;`