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 --- dir.h | 70 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'dir.h') diff --git a/dir.h b/dir.h index e3ec26143d..4c227cc3dc 100644 --- a/dir.h +++ b/dir.h @@ -202,7 +202,7 @@ struct dir_struct { }; /*Count the number of slashes for string s*/ -extern int count_slashes(const char *s); +int count_slashes(const char *s); /* * The ordering of these constants is significant, with @@ -213,24 +213,24 @@ extern int count_slashes(const char *s); #define MATCHED_RECURSIVELY 1 #define MATCHED_FNMATCH 2 #define MATCHED_EXACTLY 3 -extern int simple_length(const char *match); -extern int no_wildcard(const char *string); -extern char *common_prefix(const struct pathspec *pathspec); -extern int match_pathspec(const struct index_state *istate, +int simple_length(const char *match); +int no_wildcard(const char *string); +char *common_prefix(const struct pathspec *pathspec); +int match_pathspec(const struct index_state *istate, const struct pathspec *pathspec, const char *name, int namelen, int prefix, char *seen, int is_dir); -extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix); -extern int within_depth(const char *name, int namelen, int depth, int max_depth); +int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix); +int within_depth(const char *name, int namelen, int depth, int max_depth); -extern int fill_directory(struct dir_struct *dir, +int fill_directory(struct dir_struct *dir, struct index_state *istate, const struct pathspec *pathspec); -extern int read_directory(struct dir_struct *, struct index_state *istate, +int read_directory(struct dir_struct *, struct index_state *istate, const char *path, int len, const struct pathspec *pathspec); -extern int is_excluded_from_list(const char *pathname, int pathlen, +int is_excluded_from_list(const char *pathname, int pathlen, const char *basename, int *dtype, struct exclude_list *el, struct index_state *istate); @@ -242,37 +242,37 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir, * these implement the matching logic for dir.c:excluded_from_list and * attr.c:path_matches() */ -extern int match_basename(const char *, int, +int match_basename(const char *, int, const char *, int, int, unsigned); -extern int match_pathname(const char *, int, +int match_pathname(const char *, int, const char *, int, const char *, int, int, unsigned); -extern struct exclude *last_exclude_matching(struct dir_struct *dir, +struct exclude *last_exclude_matching(struct dir_struct *dir, struct index_state *istate, const char *name, int *dtype); -extern int is_excluded(struct dir_struct *dir, +int is_excluded(struct dir_struct *dir, struct index_state *istate, const char *name, int *dtype); -extern struct exclude_list *add_exclude_list(struct dir_struct *dir, +struct exclude_list *add_exclude_list(struct dir_struct *dir, int group_type, const char *src); -extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, +int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, struct exclude_list *el, struct index_state *istate); -extern void add_excludes_from_file(struct dir_struct *, const char *fname); -extern int add_excludes_from_blob_to_list(struct object_id *oid, +void add_excludes_from_file(struct dir_struct *, const char *fname); +int add_excludes_from_blob_to_list(struct object_id *oid, const char *base, int baselen, struct exclude_list *el); -extern void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen); -extern void add_exclude(const char *string, const char *base, +void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen); +void add_exclude(const char *string, const char *base, int baselen, struct exclude_list *el, int srcpos); -extern void clear_exclude_list(struct exclude_list *el); -extern void clear_directory(struct dir_struct *dir); -extern int file_exists(const char *); +void clear_exclude_list(struct exclude_list *el); +void clear_directory(struct dir_struct *dir); +int file_exists(const char *); -extern int is_inside_dir(const char *dir); -extern int dir_inside_of(const char *subdir, const char *dir); +int is_inside_dir(const char *dir); +int dir_inside_of(const char *subdir, const char *dir); static inline int is_dot_or_dotdot(const char *name) { @@ -281,9 +281,9 @@ static inline int is_dot_or_dotdot(const char *name) (name[1] == '.' && name[2] == '\0'))); } -extern int is_empty_dir(const char *dir); +int is_empty_dir(const char *dir); -extern void setup_standard_excludes(struct dir_struct *dir); +void setup_standard_excludes(struct dir_struct *dir); /* Constants for remove_dir_recursively: */ @@ -311,23 +311,23 @@ extern void setup_standard_excludes(struct dir_struct *dir); * This function uses path as temporary scratch space, but restores it * before returning. */ -extern int remove_dir_recursively(struct strbuf *path, int flag); +int remove_dir_recursively(struct strbuf *path, int flag); /* tries to remove the path with empty directories along it, ignores ENOENT */ -extern int remove_path(const char *path); +int remove_path(const char *path); -extern int fspathcmp(const char *a, const char *b); -extern int fspathncmp(const char *a, const char *b, size_t count); +int fspathcmp(const char *a, const char *b); +int fspathncmp(const char *a, const char *b, size_t count); /* * The prefix part of pattern must not contains wildcards. */ struct pathspec_item; -extern int git_fnmatch(const struct pathspec_item *item, +int git_fnmatch(const struct pathspec_item *item, const char *pattern, const char *string, int prefix); -extern int submodule_path_match(const struct index_state *istate, +int submodule_path_match(const struct index_state *istate, const struct pathspec *ps, const char *submodule_name, char *seen); @@ -372,10 +372,10 @@ void remove_untracked_cache(struct index_state *istate); * When `recurse_into_nested` is set, recurse into any nested submodules, * connecting them as well. */ -extern void connect_work_tree_and_git_dir(const char *work_tree, +void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir, int recurse_into_nested); -extern void relocate_gitdir(const char *path, +void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir); #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 --- dir.h | 62 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'dir.h') diff --git a/dir.h b/dir.h index 4c227cc3dc..2e6fcba389 100644 --- a/dir.h +++ b/dir.h @@ -217,23 +217,23 @@ int simple_length(const char *match); int no_wildcard(const char *string); char *common_prefix(const struct pathspec *pathspec); int match_pathspec(const struct index_state *istate, - const struct pathspec *pathspec, - const char *name, int namelen, - int prefix, char *seen, int is_dir); + const struct pathspec *pathspec, + const char *name, int namelen, + int prefix, char *seen, int is_dir); int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix); int within_depth(const char *name, int namelen, int depth, int max_depth); int fill_directory(struct dir_struct *dir, - struct index_state *istate, - const struct pathspec *pathspec); + struct index_state *istate, + const struct pathspec *pathspec); int read_directory(struct dir_struct *, struct index_state *istate, - const char *path, int len, - const struct pathspec *pathspec); + const char *path, int len, + const struct pathspec *pathspec); int is_excluded_from_list(const char *pathname, int pathlen, - const char *basename, int *dtype, - struct exclude_list *el, - struct index_state *istate); + const char *basename, int *dtype, + struct exclude_list *el, + struct index_state *istate); struct dir_entry *dir_add_ignored(struct dir_struct *dir, struct index_state *istate, const char *pathname, int len); @@ -243,30 +243,30 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir, * attr.c:path_matches() */ int match_basename(const char *, int, - const char *, int, int, unsigned); + const char *, int, int, unsigned); int match_pathname(const char *, int, - const char *, int, - const char *, int, int, unsigned); + const char *, int, + const char *, int, int, unsigned); struct exclude *last_exclude_matching(struct dir_struct *dir, - struct index_state *istate, - const char *name, int *dtype); + struct index_state *istate, + const char *name, int *dtype); int is_excluded(struct dir_struct *dir, - struct index_state *istate, - const char *name, int *dtype); + struct index_state *istate, + const char *name, int *dtype); struct exclude_list *add_exclude_list(struct dir_struct *dir, - int group_type, const char *src); + int group_type, const char *src); int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, - struct exclude_list *el, struct index_state *istate); + struct exclude_list *el, struct index_state *istate); void add_excludes_from_file(struct dir_struct *, const char *fname); int add_excludes_from_blob_to_list(struct object_id *oid, - const char *base, int baselen, - struct exclude_list *el); + const char *base, int baselen, + struct exclude_list *el); void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen); void add_exclude(const char *string, const char *base, - int baselen, struct exclude_list *el, int srcpos); + int baselen, struct exclude_list *el, int srcpos); void clear_exclude_list(struct exclude_list *el); void clear_directory(struct dir_struct *dir); int file_exists(const char *); @@ -324,13 +324,13 @@ int fspathncmp(const char *a, const char *b, size_t count); */ struct pathspec_item; int git_fnmatch(const struct pathspec_item *item, - const char *pattern, const char *string, - int prefix); + const char *pattern, const char *string, + int prefix); int submodule_path_match(const struct index_state *istate, - const struct pathspec *ps, - const char *submodule_name, - char *seen); + const struct pathspec *ps, + const char *submodule_name, + char *seen); static inline int ce_path_match(const struct index_state *istate, const struct cache_entry *ce, @@ -373,9 +373,9 @@ void remove_untracked_cache(struct index_state *istate); * connecting them as well. */ void connect_work_tree_and_git_dir(const char *work_tree, - const char *git_dir, - int recurse_into_nested); + const char *git_dir, + int recurse_into_nested); void relocate_gitdir(const char *path, - const char *old_git_dir, - const char *new_git_dir); + const char *old_git_dir, + const char *new_git_dir); #endif -- cgit v1.2.3