summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-04-29 08:28:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-05 06:20:06 (GMT)
commit554544276a604c144df45efcb060c80aa322088c (patch)
treece55b3dc9ca47c326991ecfc06a2b1103f60be3a /advice.h
parentffac537e6cbbf934b08745a378932722df287a53 (diff)
downloadgit-554544276a604c144df45efcb060c80aa322088c.zip
git-554544276a604c144df45efcb060c80aa322088c.tar.gz
git-554544276a604c144df45efcb060c80aa322088c.tar.bz2
*.[ch]: remove extern from function declarations using spatch
There has been a push to remove extern from function declarations. Remove some instances of "extern" for function declarations which are caught by Coccinelle. Note that Coccinelle has some difficulty with processing functions with `__attribute__` or varargs so some `extern` declarations are left behind to be dealt with in a future patch. This was the Coccinelle patch used: @@ type T; identifier f; @@ - extern T f(...); and it was run with: $ git ls-files \*.{c,h} | grep -v ^compat/ | xargs spatch --sp-file contrib/coccinelle/noextern.cocci --in-place Files under `compat/` are intentionally excluded as some are directly copied from external sources and we should avoid churning them as much as possible. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/advice.h b/advice.h
index f875f8c..4a2052e 100644
--- a/advice.h
+++ b/advice.h
@@ -31,7 +31,7 @@ int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
-extern void NORETURN die_resolve_conflict(const char *me);
+void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
void detach_advice(const char *new_name);