aboutsummaryrefslogtreecommitdiffstats
path: root/dir.h
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-04-29 04:28:23 -0400
committerJunio C Hamano <gitster@pobox.com>2019-05-05 15:20:10 +0900
commitad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 (patch)
treecbde3e662ca85541fd7d0c9b0220776fee59cdbf /dir.h
parentb199d7147a218c3b10b077f9caad0f207bc34d7a (diff)
downloadgit-ad6dad0996f9226b2c3a5a3c725bf2952e52d7e7.tar.gz
*.[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 <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h62
1 files changed, 31 insertions, 31 deletions
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