diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-28 20:17:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-28 20:17:59 (GMT) |
| commit | dd6d3c90eeff56770f2f4b88fb61cc44bf01d890 (patch) | |
| tree | 55b66b254ad151323682e834c8eef5cf55eac6d5 /merge-ort.c | |
| parent | c9d6d8a1938f86594b33785a8228d9f35ad457c8 (diff) | |
| parent | 927dc33070563d6646c903daf919dde80d8878d4 (diff) | |
| download | git-dd6d3c90eeff56770f2f4b88fb61cc44bf01d890.zip git-dd6d3c90eeff56770f2f4b88fb61cc44bf01d890.tar.gz git-dd6d3c90eeff56770f2f4b88fb61cc44bf01d890.tar.bz2 | |
Merge branch 'ab/attribute-format'
Many "printf"-like helper functions we have have been annotated
with __attribute__() to catch placeholder/parameter mismatches.
* ab/attribute-format:
advice.h: add missing __attribute__((format)) & fix usage
*.h: add a few missing __attribute__((format))
*.c static functions: add missing __attribute__((format))
sequencer.c: move static function to avoid forward decl
*.c static functions: don't forward-declare __attribute__
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 8cfa0cc..c3b3ab2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -530,6 +530,7 @@ static void clear_or_reinit_internal_opts(struct merge_options_internal *opti, renames->callback_data_nr = renames->callback_data_alloc = 0; } +__attribute__((format (printf, 2, 3))) static int err(struct merge_options *opt, const char *err, ...) { va_list params; |