*.c static functions: don't forward-declare __attribute__
9cf6d3357aa (Add git-index-pack utility, 2005-10-12) and 466dbc42f58 (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>
Ævar Arnfjörð Bjarmason committed
Jul 10, 2021 at 10:47 UTC
103e02c7001f5c4989d56360c8cfc615f29fc9a7
2 files changed
+3
-6
builtin/index-pack.c
+1
-3
@@ -369,9 +369,7 @@ static void parse_pack_header(void)
369
use(sizeof(struct pack_header));
370
}
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)))
373
static NORETURN void bad_object(off_t offset, const char *format, ...)
374
{
375
va_list params;
builtin/receive-pack.c
+2
-3
@@ -425,9 +425,6 @@ static int proc_receive_ref_matches(struct command *cmd)
425
return 0;
426
}
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
-
428
static void report_message(const char *prefix, const char *err, va_list params)
429
{
430
int sz;
@@ -445,6 +442,7 @@ static void report_message(const char *prefix, const char *err, va_list params)
442
xwrite(2, msg, sz);
443
}
444
445
+__attribute__((format (printf, 1, 2)))
446
static void rp_warning(const char *err, ...)
447
{
448
va_list params;
@@ -453,6 +451,7 @@ static void rp_warning(const char *err, ...)
451
va_end(params);
452
}
453
454
+__attribute__((format (printf, 1, 2)))
455
static void rp_error(const char *err, ...)
456
{
457
va_list params;