From 554544276a604c144df45efcb060c80aa322088c Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Mon, 29 Apr 2019 04:28:14 -0400 Subject: *.[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 Signed-off-by: Junio C Hamano --- xdiff-interface.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xdiff-interface.h') diff --git a/xdiff-interface.h b/xdiff-interface.h index 2d41fffd4c..a71950a10b 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -27,9 +27,9 @@ int read_mmfile(mmfile_t *ptr, const char *filename); void read_mmblob(mmfile_t *ptr, const struct object_id *oid); int buffer_is_binary(const char *ptr, unsigned long size); -extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); -extern void xdiff_clear_find_func(xdemitconf_t *xecfg); -extern int git_xmerge_config(const char *var, const char *value, void *cb); +void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); +void xdiff_clear_find_func(xdemitconf_t *xecfg); +int git_xmerge_config(const char *var, const char *value, void *cb); extern int git_xmerge_style; /* @@ -46,7 +46,7 @@ void discard_hunk_line(void *priv, * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces * are treated for the comparision. */ -extern int xdiff_compare_lines(const char *l1, long s1, +int xdiff_compare_lines(const char *l1, long s1, const char *l2, long s2, long flags); /* @@ -54,6 +54,6 @@ extern int xdiff_compare_lines(const char *l1, long s1, * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces * are treated for the hash. */ -extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags); +unsigned long xdiff_hash_string(const char *s, size_t len, long flags); #endif -- cgit v1.2.3 From ad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Mon, 29 Apr 2019 04:28:23 -0400 Subject: *.[ch]: manually align parameter lists In previous patches, extern was mechanically removed from function declarations without care to formatting, causing parameter lists to be misaligned. Manually format changed sections such that the parameter lists should be realigned. Viewing this patch with 'git diff -w' should produce no output. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- xdiff-interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xdiff-interface.h') diff --git a/xdiff-interface.h b/xdiff-interface.h index a71950a10b..ede4246bbd 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -47,7 +47,7 @@ void discard_hunk_line(void *priv, * are treated for the comparision. */ int xdiff_compare_lines(const char *l1, long s1, - const char *l2, long s2, long flags); + const char *l2, long s2, long flags); /* * Returns a hash of the string s of length len. -- cgit v1.2.3