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 --- cache.h | 340 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 170 insertions(+), 170 deletions(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index ac92421f3a..e21a10b380 100644 --- a/cache.h +++ b/cache.h @@ -350,10 +350,10 @@ struct index_state { }; /* Name hashing */ -extern int test_lazy_init_name_hash(struct index_state *istate, int try_threaded); -extern void add_name_hash(struct index_state *istate, struct cache_entry *ce); -extern void remove_name_hash(struct index_state *istate, struct cache_entry *ce); -extern void free_name_hash(struct index_state *istate); +int test_lazy_init_name_hash(struct index_state *istate, int try_threaded); +void add_name_hash(struct index_state *istate, struct cache_entry *ce); +void remove_name_hash(struct index_state *istate, struct cache_entry *ce); +void free_name_hash(struct index_state *istate); /* Cache entry creation and cleanup */ @@ -543,7 +543,7 @@ static inline enum object_type object_type(unsigned int mode) */ extern const char * const local_repo_env[]; -extern void setup_git_env(const char *git_dir); +void setup_git_env(const char *git_dir); /* * Returns true iff we have a configured git repository (either via @@ -552,29 +552,29 @@ extern void setup_git_env(const char *git_dir); int have_git_dir(void); extern int is_bare_repository_cfg; -extern int is_bare_repository(void); -extern int is_inside_git_dir(void); +int is_bare_repository(void); +int is_inside_git_dir(void); extern char *git_work_tree_cfg; -extern int is_inside_work_tree(void); -extern const char *get_git_dir(void); -extern const char *get_git_common_dir(void); -extern char *get_object_directory(void); -extern char *get_index_file(void); -extern char *get_graft_file(struct repository *r); -extern void set_git_dir(const char *path); -extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir); -extern int get_common_dir(struct strbuf *sb, const char *gitdir); -extern const char *get_git_namespace(void); -extern const char *strip_namespace(const char *namespaced_ref); -extern const char *get_super_prefix(void); -extern const char *get_git_work_tree(void); +int is_inside_work_tree(void); +const char *get_git_dir(void); +const char *get_git_common_dir(void); +char *get_object_directory(void); +char *get_index_file(void); +char *get_graft_file(struct repository *r); +void set_git_dir(const char *path); +int get_common_dir_noenv(struct strbuf *sb, const char *gitdir); +int get_common_dir(struct strbuf *sb, const char *gitdir); +const char *get_git_namespace(void); +const char *strip_namespace(const char *namespaced_ref); +const char *get_super_prefix(void); +const char *get_git_work_tree(void); /* * Return true if the given path is a git directory; note that this _just_ * looks at the directory itself. If you want to know whether "foo/.git" * is a repository, you must feed that path, not just "foo". */ -extern int is_git_directory(const char *path); +int is_git_directory(const char *path); /* * Return 1 if the given path is the root of a git repository or @@ -586,7 +586,7 @@ extern int is_git_directory(const char *path); * as we usually consider sub-repos precious, and would prefer to err on the * side of not disrupting or deleting them. */ -extern int is_nonbare_repository_dir(struct strbuf *path); +int is_nonbare_repository_dir(struct strbuf *path); #define READ_GITFILE_ERR_STAT_FAILED 1 #define READ_GITFILE_ERR_NOT_A_FILE 2 @@ -596,17 +596,17 @@ extern int is_nonbare_repository_dir(struct strbuf *path); #define READ_GITFILE_ERR_NO_PATH 6 #define READ_GITFILE_ERR_NOT_A_REPO 7 #define READ_GITFILE_ERR_TOO_LARGE 8 -extern void read_gitfile_error_die(int error_code, const char *path, const char *dir); -extern const char *read_gitfile_gently(const char *path, int *return_error_code); +void read_gitfile_error_die(int error_code, const char *path, const char *dir); +const char *read_gitfile_gently(const char *path, int *return_error_code); #define read_gitfile(path) read_gitfile_gently((path), NULL) -extern const char *resolve_gitdir_gently(const char *suspect, int *return_error_code); +const char *resolve_gitdir_gently(const char *suspect, int *return_error_code); #define resolve_gitdir(path) resolve_gitdir_gently((path), NULL) -extern void set_git_work_tree(const char *tree); +void set_git_work_tree(const char *tree); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" -extern void setup_work_tree(void); +void setup_work_tree(void); /* * Find the commondir and gitdir of the repository that contains the current * working directory, without changing the working directory or other global @@ -615,12 +615,12 @@ extern void setup_work_tree(void); * both have the same result appended to the buffer. The return value is * either 0 upon success and non-zero if no repository was found. */ -extern int discover_git_directory(struct strbuf *commondir, +int discover_git_directory(struct strbuf *commondir, struct strbuf *gitdir); -extern const char *setup_git_directory_gently(int *); -extern const char *setup_git_directory(void); -extern char *prefix_path(const char *prefix, int len, const char *path); -extern char *prefix_path_gently(const char *prefix, int len, int *remaining, const char *path); +const char *setup_git_directory_gently(int *); +const char *setup_git_directory(void); +char *prefix_path(const char *prefix, int len, const char *path); +char *prefix_path_gently(const char *prefix, int len, int *remaining, const char *path); /* * Concatenate "prefix" (if len is non-zero) and "path", with no @@ -632,23 +632,23 @@ extern char *prefix_path_gently(const char *prefix, int len, int *remaining, con * The return value is always a newly allocated string (even if the * prefix was empty). */ -extern char *prefix_filename(const char *prefix, const char *path); +char *prefix_filename(const char *prefix, const char *path); -extern int check_filename(const char *prefix, const char *name); -extern void verify_filename(const char *prefix, +int check_filename(const char *prefix, const char *name); +void verify_filename(const char *prefix, const char *name, int diagnose_misspelt_rev); -extern void verify_non_filename(const char *prefix, const char *name); -extern int path_inside_repo(const char *prefix, const char *path); +void verify_non_filename(const char *prefix, const char *name); +int path_inside_repo(const char *prefix, const char *path); #define INIT_DB_QUIET 0x0001 #define INIT_DB_EXIST_OK 0x0002 -extern int init_db(const char *git_dir, const char *real_git_dir, +int init_db(const char *git_dir, const char *real_git_dir, const char *template_dir, unsigned int flags); -extern void sanitize_stdfds(void); -extern int daemonize(void); +void sanitize_stdfds(void); +int daemonize(void); #define alloc_nr(x) (((x)+16)*3/2) @@ -672,14 +672,14 @@ extern int daemonize(void); /* Initialize and use the cache information */ struct lock_file; -extern void preload_index(struct index_state *index, +void preload_index(struct index_state *index, const struct pathspec *pathspec, unsigned int refresh_flags); -extern int do_read_index(struct index_state *istate, const char *path, +int do_read_index(struct index_state *istate, const char *path, int must_exist); /* for testting only! */ -extern int read_index_from(struct index_state *, const char *path, +int read_index_from(struct index_state *, const char *path, const char *gitdir); -extern int is_index_unborn(struct index_state *); +int is_index_unborn(struct index_state *); /* For use with `write_locked_index()`. */ #define COMMIT_LOCK (1 << 0) @@ -704,11 +704,11 @@ extern int is_index_unborn(struct index_state *); * If `SKIP_IF_UNCHANGED` is given and the index is unchanged, nothing * is written (and the lock is rolled back if `COMMIT_LOCK` is given). */ -extern int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags); +int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags); -extern int discard_index(struct index_state *); -extern void move_index_extensions(struct index_state *dst, struct index_state *src); -extern int unmerged_index(const struct index_state *); +int discard_index(struct index_state *); +void move_index_extensions(struct index_state *dst, struct index_state *src); +int unmerged_index(const struct index_state *); /** * Returns 1 if istate differs from tree, 0 otherwise. If tree is NULL, @@ -717,15 +717,15 @@ extern int unmerged_index(const struct index_state *); * provided, the space-separated list of files that differ will be appended * to it. */ -extern int repo_index_has_changes(struct repository *repo, +int repo_index_has_changes(struct repository *repo, struct tree *tree, struct strbuf *sb); -extern int verify_path(const char *path, unsigned mode); -extern int strcmp_offset(const char *s1, const char *s2, size_t *first_change); -extern int index_dir_exists(struct index_state *istate, const char *name, int namelen); -extern void adjust_dirname_case(struct index_state *istate, char *name); -extern struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase); +int verify_path(const char *path, unsigned mode); +int strcmp_offset(const char *s1, const char *s2, size_t *first_change); +int index_dir_exists(struct index_state *istate, const char *name, int namelen); +void adjust_dirname_case(struct index_state *istate, char *name); +struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase); /* * Searches for an entry defined by name and namelen in the given index. @@ -744,7 +744,7 @@ extern struct cache_entry *index_file_exists(struct index_state *istate, const c * index_name_pos(&index, "f", 1) -> -3 * index_name_pos(&index, "g", 1) -> -5 */ -extern int index_name_pos(const struct index_state *, const char *name, int namelen); +int index_name_pos(const struct index_state *, const char *name, int namelen); #define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */ #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ @@ -753,14 +753,14 @@ extern int index_name_pos(const struct index_state *, const char *name, int name #define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */ #define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */ #define ADD_CACHE_RENORMALIZE 64 /* Pass along HASH_RENORMALIZE */ -extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option); -extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name); +int add_index_entry(struct index_state *, struct cache_entry *ce, int option); +void rename_index_entry_at(struct index_state *, int pos, const char *new_name); /* Remove entry, return true if there are more entries to go. */ -extern int remove_index_entry_at(struct index_state *, int pos); +int remove_index_entry_at(struct index_state *, int pos); -extern void remove_marked_cache_entries(struct index_state *istate, int invalidate); -extern int remove_file_from_index(struct index_state *, const char *path); +void remove_marked_cache_entries(struct index_state *istate, int invalidate); +int remove_file_from_index(struct index_state *, const char *path); #define ADD_CACHE_VERBOSE 1 #define ADD_CACHE_PRETEND 2 #define ADD_CACHE_IGNORE_ERRORS 4 @@ -775,14 +775,14 @@ extern int remove_file_from_index(struct index_state *, const char *path); * the latter will do necessary lstat(2) internally before * calling the former. */ -extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags); -extern int add_file_to_index(struct index_state *, const char *path, int flags); +int add_to_index(struct index_state *, const char *path, struct stat *, int flags); +int add_file_to_index(struct index_state *, const char *path, int flags); -extern int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip); -extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b); -extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce); -extern int index_name_is_other(const struct index_state *, const char *, int); -extern void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *); +int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip); +int ce_same_name(const struct cache_entry *a, const struct cache_entry *b); +void set_object_name_for_intent_to_add_entry(struct cache_entry *ce); +int index_name_is_other(const struct index_state *, const char *, int); +void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *); /* do stat comparison even if CE_VALID is true */ #define CE_MATCH_IGNORE_VALID 01 @@ -796,22 +796,22 @@ extern void *read_blob_data_from_index(const struct index_state *, const char *, #define CE_MATCH_REFRESH 0x10 /* don't refresh_fsmonitor state or do stat comparison even if CE_FSMONITOR_VALID is true */ #define CE_MATCH_IGNORE_FSMONITOR 0X20 -extern int is_racy_timestamp(const struct index_state *istate, +int is_racy_timestamp(const struct index_state *istate, const struct cache_entry *ce); -extern int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int); -extern int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int); +int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int); +int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int); #define HASH_WRITE_OBJECT 1 #define HASH_FORMAT_CHECK 2 #define HASH_RENORMALIZE 4 -extern int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags); -extern int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags); +int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags); +int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags); /* * Record to sd the data from st that we use to check whether a file * might have changed. */ -extern void fill_stat_data(struct stat_data *sd, struct stat *st); +void fill_stat_data(struct stat_data *sd, struct stat *st); /* * Return 0 if st is consistent with a file not having been changed @@ -819,11 +819,11 @@ extern void fill_stat_data(struct stat_data *sd, struct stat *st); * combination of MTIME_CHANGED, CTIME_CHANGED, OWNER_CHANGED, * INODE_CHANGED, and DATA_CHANGED. */ -extern int match_stat_data(const struct stat_data *sd, struct stat *st); -extern int match_stat_data_racy(const struct index_state *istate, +int match_stat_data(const struct stat_data *sd, struct stat *st); +int match_stat_data_racy(const struct index_state *istate, const struct stat_data *sd, struct stat *st); -extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); +void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); #define REFRESH_REALLY 0x0001 /* ignore_valid */ #define REFRESH_UNMERGED 0x0002 /* allow unmerged */ @@ -832,10 +832,10 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); #define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */ #define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */ #define REFRESH_PROGRESS 0x0040 /* show progress bar if stderr is tty */ -extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg); -extern struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int); +int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg); +struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int); -extern void set_alternate_index_output(const char *); +void set_alternate_index_output(const char *); extern int verify_index_checksum; extern int verify_ce_order; @@ -1020,7 +1020,7 @@ int verify_repository_format(const struct repository_format *format, * set_git_dir() before calling this, and use it only for "are we in a valid * repo?". */ -extern void check_repository_format(void); +void check_repository_format(void); #define MTIME_CHANGED 0x0001 #define CTIME_CHANGED 0x0002 @@ -1045,8 +1045,8 @@ extern void check_repository_format(void); * Note that while this version avoids the static buffer, it is not fully * reentrant, as it calls into other non-reentrant git code. */ -extern const char *find_unique_abbrev(const struct object_id *oid, int len); -extern int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len); +const char *find_unique_abbrev(const struct object_id *oid, int len); +int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len); extern const unsigned char null_sha1[GIT_MAX_RAWSZ]; extern const struct object_id null_oid; @@ -1242,7 +1242,7 @@ typedef int create_file_fn(const char *path, void *cb); int raceproof_create_file(const char *path, create_file_fn fn, void *cb); int mkdir_in_gitdir(const char *path); -extern char *expand_user_path(const char *path, int real_home); +char *expand_user_path(const char *path, int real_home); const char *enter_repo(const char *path, int strict); static inline int is_absolute_path(const char *path) { @@ -1286,26 +1286,26 @@ int looks_like_command_line_option(const char *str); * "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise * "$HOME/.config/git/$filename". Return NULL upon error. */ -extern char *xdg_config_home(const char *filename); +char *xdg_config_home(const char *filename); /** * Return a newly allocated string with the evaluation of * "$XDG_CACHE_HOME/git/$filename" if $XDG_CACHE_HOME is non-empty, otherwise * "$HOME/.cache/git/$filename". Return NULL upon error. */ -extern char *xdg_cache_home(const char *filename); +char *xdg_cache_home(const char *filename); -extern int git_open_cloexec(const char *name, int flags); +int git_open_cloexec(const char *name, int flags); #define git_open(name) git_open_cloexec(name, O_RDONLY) -extern int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz); -extern int parse_loose_header(const char *hdr, unsigned long *sizep); +int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz); +int parse_loose_header(const char *hdr, unsigned long *sizep); -extern int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type); +int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type); -extern int finalize_object_file(const char *tmpfile, const char *filename); +int finalize_object_file(const char *tmpfile, const char *filename); /* Helper to check and "touch" a file */ -extern int check_and_freshen_file(const char *fn, int freshen); +int check_and_freshen_file(const char *fn, int freshen); extern const signed char hexval_table[256]; static inline unsigned int hexval(unsigned char c) @@ -1378,21 +1378,21 @@ enum get_oid_result { */ }; -extern int get_oid(const char *str, struct object_id *oid); -extern int get_oid_commit(const char *str, struct object_id *oid); -extern int get_oid_committish(const char *str, struct object_id *oid); -extern int get_oid_tree(const char *str, struct object_id *oid); -extern int get_oid_treeish(const char *str, struct object_id *oid); -extern int get_oid_blob(const char *str, struct object_id *oid); -extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); -extern enum get_oid_result get_oid_with_context(struct repository *repo, const char *str, +int get_oid(const char *str, struct object_id *oid); +int get_oid_commit(const char *str, struct object_id *oid); +int get_oid_committish(const char *str, struct object_id *oid); +int get_oid_tree(const char *str, struct object_id *oid); +int get_oid_treeish(const char *str, struct object_id *oid); +int get_oid_blob(const char *str, struct object_id *oid); +void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); +enum get_oid_result get_oid_with_context(struct repository *repo, const char *str, unsigned flags, struct object_id *oid, struct object_context *oc); typedef int each_abbrev_fn(const struct object_id *oid, void *); -extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *); +int for_each_abbrev(const char *prefix, each_abbrev_fn, void *); -extern int set_disambiguate_hint_config(const char *var, const char *value); +int set_disambiguate_hint_config(const char *var, const char *value); /* * Try to read a SHA1 in hexadecimal format from the 40 characters @@ -1401,15 +1401,15 @@ extern int set_disambiguate_hint_config(const char *var, const char *value); * input, so it is safe to pass this function an arbitrary * null-terminated string. */ -extern int get_sha1_hex(const char *hex, unsigned char *sha1); -extern int get_oid_hex(const char *hex, struct object_id *sha1); +int get_sha1_hex(const char *hex, unsigned char *sha1); +int get_oid_hex(const char *hex, struct object_id *sha1); /* * Read `len` pairs of hexadecimal digits from `hex` and write the * values to `binary` as `len` bytes. Return 0 on success, or -1 if * the input does not consist of hex digits). */ -extern int hex_to_bytes(unsigned char *binary, const char *hex, size_t len); +int hex_to_bytes(unsigned char *binary, const char *hex, size_t len); /* * Convert a binary hash to its hex equivalent. The `_r` variant is reentrant, @@ -1437,7 +1437,7 @@ char *oid_to_hex(const struct object_id *oid); /* same static buffer */ * other invalid character. end is only updated on success; otherwise, it is * unmodified. */ -extern int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); +int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); /* * This reads short-hand syntax that not only evaluates to a commit @@ -1468,23 +1468,23 @@ extern int parse_oid_hex(const char *hex, struct object_id *oid, const char **en #define INTERPRET_BRANCH_LOCAL (1<<0) #define INTERPRET_BRANCH_REMOTE (1<<1) #define INTERPRET_BRANCH_HEAD (1<<2) -extern int interpret_branch_name(const char *str, int len, struct strbuf *, +int interpret_branch_name(const char *str, int len, struct strbuf *, unsigned allowed); -extern int get_oid_mb(const char *str, struct object_id *oid); +int get_oid_mb(const char *str, struct object_id *oid); -extern int validate_headref(const char *ref); +int validate_headref(const char *ref); -extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2); -extern int df_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2); -extern int name_compare(const char *name1, size_t len1, const char *name2, size_t len2); -extern int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2); +int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2); +int df_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2); +int name_compare(const char *name1, size_t len1, const char *name2, size_t len2); +int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2); -extern void *read_object_with_reference(const struct object_id *oid, +void *read_object_with_reference(const struct object_id *oid, const char *required_type, unsigned long *size, struct object_id *oid_ret); -extern struct object *peel_to_type(const char *name, int namelen, +struct object *peel_to_type(const char *name, int namelen, struct object *o, enum object_type); enum date_mode_type { @@ -1539,20 +1539,20 @@ enum want_ident { WANT_COMMITTER_IDENT }; -extern const char *git_author_info(int); -extern const char *git_committer_info(int); -extern const char *fmt_ident(const char *name, const char *email, +const char *git_author_info(int); +const char *git_committer_info(int); +const char *fmt_ident(const char *name, const char *email, enum want_ident whose_ident, const char *date_str, int); -extern const char *fmt_name(enum want_ident); -extern const char *ident_default_name(void); -extern const char *ident_default_email(void); -extern const char *git_editor(void); -extern const char *git_sequence_editor(void); -extern const char *git_pager(int stdout_is_tty); -extern int is_terminal_dumb(void); -extern int git_ident_config(const char *, const char *, void *); -extern void reset_ident_date(void); +const char *fmt_name(enum want_ident); +const char *ident_default_name(void); +const char *ident_default_email(void); +const char *git_editor(void); +const char *git_sequence_editor(void); +const char *git_pager(int stdout_is_tty); +int is_terminal_dumb(void); +int git_ident_config(const char *, const char *, void *); +void reset_ident_date(void); struct ident_split { const char *name_begin; @@ -1568,7 +1568,7 @@ struct ident_split { * Signals an success with 0, but time part of the result may be NULL * if the input lacks timestamp and zone */ -extern int split_ident_line(struct ident_split *, const char *, int); +int split_ident_line(struct ident_split *, const char *, int); /* * Like show_date, but pull the timestamp and tz parameters from @@ -1585,7 +1585,7 @@ const char *show_ident_date(const struct ident_split *id, * Because there are two fields, we must choose one as the primary key; we * currently arbitrarily pick the email. */ -extern int ident_cmp(const struct ident_split *, const struct ident_split *); +int ident_cmp(const struct ident_split *, const struct ident_split *); struct checkout { struct index_state *istate; @@ -1601,14 +1601,14 @@ struct checkout { #define CHECKOUT_INIT { NULL, "" } #define TEMPORARY_FILENAME_LENGTH 25 -extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath, int *nr_checkouts); -extern void enable_delayed_checkout(struct checkout *state); -extern int finish_delayed_checkout(struct checkout *state, int *nr_checkouts); +int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath, int *nr_checkouts); +void enable_delayed_checkout(struct checkout *state); +int finish_delayed_checkout(struct checkout *state, int *nr_checkouts); /* * Unlink the last component and schedule the leading directories for * removal, such that empty directories get removed. */ -extern void unlink_entry(const struct cache_entry *ce); +void unlink_entry(const struct cache_entry *ce); struct cache_def { struct strbuf path; @@ -1622,12 +1622,12 @@ static inline void cache_def_clear(struct cache_def *cache) strbuf_release(&cache->path); } -extern int has_symlink_leading_path(const char *name, int len); -extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int); -extern int check_leading_path(const char *name, int len); -extern int has_dirs_only_path(const char *name, int len, int prefix_len); -extern void schedule_dir_for_removal(const char *name, int len); -extern void remove_scheduled_dirs(void); +int has_symlink_leading_path(const char *name, int len); +int threaded_has_symlink_leading_path(struct cache_def *, const char *, int); +int check_leading_path(const char *name, int len); +int has_dirs_only_path(const char *name, int len, int prefix_len); +void schedule_dir_for_removal(const char *name, int len); +void remove_scheduled_dirs(void); struct pack_window { struct pack_window *next; @@ -1649,14 +1649,14 @@ struct pack_entry { * usual "XXXXXX" trailer, and the resulting filename is written into the * "template" buffer. Returns the open descriptor. */ -extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern); +int odb_mkstemp(struct strbuf *temp_filename, const char *pattern); /* * Create a pack .keep file named "name" (which should generally be the output * of odb_pack_name). Returns a file descriptor opened for writing, or -1 on * error. */ -extern int odb_pack_keep(const char *name); +int odb_pack_keep(const char *name); /* * Set this to 0 to prevent oid_object_info_extended() from fetching missing @@ -1667,10 +1667,10 @@ extern int odb_pack_keep(const char *name); extern int fetch_if_missing; /* Dumb servers support */ -extern int update_server_info(int); +int update_server_info(int); -extern const char *get_log_output_encoding(void); -extern const char *get_commit_output_encoding(void); +const char *get_log_output_encoding(void); +const char *get_commit_output_encoding(void); /* * This is a hack for test programs like test-dump-untracked-cache to @@ -1679,8 +1679,8 @@ extern const char *get_commit_output_encoding(void); */ extern int ignore_untracked_cache_config; -extern int committer_ident_sufficiently_given(void); -extern int author_ident_sufficiently_given(void); +int committer_ident_sufficiently_given(void); +int author_ident_sufficiently_given(void); extern const char *git_commit_encoding; extern const char *git_log_output_encoding; @@ -1688,22 +1688,22 @@ extern const char *git_mailmap_file; extern const char *git_mailmap_blob; /* IO helper functions */ -extern void maybe_flush_or_die(FILE *, const char *); +void maybe_flush_or_die(FILE *, const char *); __attribute__((format (printf, 2, 3))) extern void fprintf_or_die(FILE *, const char *fmt, ...); #define COPY_READ_ERROR (-2) #define COPY_WRITE_ERROR (-3) -extern int copy_fd(int ifd, int ofd); -extern int copy_file(const char *dst, const char *src, int mode); -extern int copy_file_with_time(const char *dst, const char *src, int mode); +int copy_fd(int ifd, int ofd); +int copy_file(const char *dst, const char *src, int mode); +int copy_file_with_time(const char *dst, const char *src, int mode); -extern void write_or_die(int fd, const void *buf, size_t count); -extern void fsync_or_die(int fd, const char *); +void write_or_die(int fd, const void *buf, size_t count); +void fsync_or_die(int fd, const char *); -extern ssize_t read_in_full(int fd, void *buf, size_t count); -extern ssize_t write_in_full(int fd, const void *buf, size_t count); -extern ssize_t pread_in_full(int fd, void *buf, size_t count, off_t offset); +ssize_t read_in_full(int fd, void *buf, size_t count); +ssize_t write_in_full(int fd, const void *buf, size_t count); +ssize_t pread_in_full(int fd, void *buf, size_t count, off_t offset); static inline ssize_t write_str_in_full(int fd, const char *str) { @@ -1714,7 +1714,7 @@ static inline ssize_t write_str_in_full(int fd, const char *str) * Open (and truncate) the file at path, write the contents of buf to it, * and close it. Dies if any errors are encountered. */ -extern void write_file_buf(const char *path, const char *buf, size_t len); +void write_file_buf(const char *path, const char *buf, size_t len); /** * Like write_file_buf(), but format the contents into a buffer first. @@ -1727,13 +1727,13 @@ __attribute__((format (printf, 2, 3))) extern void write_file(const char *path, const char *fmt, ...); /* pager.c */ -extern void setup_pager(void); -extern int pager_in_use(void); +void setup_pager(void); +int pager_in_use(void); extern int pager_use_color; -extern int term_columns(void); -extern int decimal_width(uintmax_t); -extern int check_pager_config(const char *cmd); -extern void prepare_pager_args(struct child_process *, const char *pager); +int term_columns(void); +int decimal_width(uintmax_t); +int check_pager_config(const char *cmd); +void prepare_pager_args(struct child_process *, const char *pager); extern const char *editor_program; extern const char *askpass_program; @@ -1777,13 +1777,13 @@ void shift_tree_by(const struct object_id *, const struct object_id *, struct ob /* All WS_* -- when extended, adapt diff.c emit_symbol */ #define WS_RULE_MASK 07777 extern unsigned whitespace_rule_cfg; -extern unsigned whitespace_rule(struct index_state *, const char *); -extern unsigned parse_whitespace_rule(const char *); -extern unsigned ws_check(const char *line, int len, unsigned ws_rule); -extern void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws); -extern char *whitespace_error_string(unsigned ws); -extern void ws_fix_copy(struct strbuf *, const char *, int, unsigned, int *); -extern int ws_blank_line(const char *line, int len, unsigned ws_rule); +unsigned whitespace_rule(struct index_state *, const char *); +unsigned parse_whitespace_rule(const char *); +unsigned ws_check(const char *line, int len, unsigned ws_rule); +void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws); +char *whitespace_error_string(unsigned ws); +void ws_fix_copy(struct strbuf *, const char *, int, unsigned, int *); +int ws_blank_line(const char *line, int len, unsigned ws_rule); #define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK) /* ls-files */ @@ -1853,9 +1853,9 @@ void safe_create_dir(const char *dir, int share); * Should we print an ellipsis after an abbreviated SHA-1 value * when doing diff-raw output or indicating a detached HEAD? */ -extern int print_sha1_ellipsis(void); +int print_sha1_ellipsis(void); /* Return 1 if the file is empty or does not exists, 0 otherwise. */ -extern int is_empty_or_missing_file(const char *filename); +int is_empty_or_missing_file(const char *filename); #endif /* CACHE_H */ -- cgit v1.3 From b199d7147a218c3b10b077f9caad0f207bc34d7a Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Mon, 29 Apr 2019 04:28:20 -0400 Subject: *.[ch]: remove extern from function declarations using sed There has been a push to remove extern from function declarations. Finish the job by removing all instances of "extern" for function declarations in headers using sed. This was done by running the following on my system with sed 4.2.2: $ git ls-files \*.{c,h} | grep -v ^compat/ | xargs sed -i'' -e 's/^\(\s*\)extern \([^(]*([^*]\)/\1\2/' Files under `compat/` are intentionally excluded as some are directly copied from external sources and we should avoid churning them as much as possible. Then, leftover instances of extern were found by running $ git grep -w -C3 extern \*.{c,h} and manually checking the output. No other instances were found. Note that the regex used specifically excludes function variables which _should_ be left as extern. Not the most elegant way to do it but it gets the job done. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- cache.h | 4 ++-- commit.h | 2 +- config.h | 2 +- exec-cmd.h | 2 +- git-compat-util.h | 20 ++++++++++---------- khash.h | 14 +++++++------- path.h | 30 +++++++++++++++--------------- quote.h | 2 +- run-command.h | 2 +- trace.h | 18 +++++++++--------- worktree.h | 2 +- 11 files changed, 49 insertions(+), 49 deletions(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index e21a10b380..1f42d5ecb1 100644 --- a/cache.h +++ b/cache.h @@ -1690,7 +1690,7 @@ extern const char *git_mailmap_blob; /* IO helper functions */ void maybe_flush_or_die(FILE *, const char *); __attribute__((format (printf, 2, 3))) -extern void fprintf_or_die(FILE *, const char *fmt, ...); +void fprintf_or_die(FILE *, const char *fmt, ...); #define COPY_READ_ERROR (-2) #define COPY_WRITE_ERROR (-3) @@ -1724,7 +1724,7 @@ void write_file_buf(const char *path, const char *buf, size_t len); * write_file(path, "counter: %d", ctr); */ __attribute__((format (printf, 2, 3))) -extern void write_file(const char *path, const char *fmt, ...); +void write_file(const char *path, const char *fmt, ...); /* pager.c */ void setup_pager(void); diff --git a/commit.h b/commit.h index 26d0b51758..40744e1bed 100644 --- a/commit.h +++ b/commit.h @@ -379,6 +379,6 @@ int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused) int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused); LAST_ARG_MUST_BE_NULL -extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); +int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); #endif /* COMMIT_H */ diff --git a/config.h b/config.h index f9d5593c8b..1482b9b7fa 100644 --- a/config.h +++ b/config.h @@ -265,7 +265,7 @@ struct key_value_info { enum config_scope scope; }; -extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3))); +NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3))); NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr); #define LOOKUP_CONFIG(mapping, var) \ diff --git a/exec-cmd.h b/exec-cmd.h index bddf5cb934..8cd1df28d3 100644 --- a/exec-cmd.h +++ b/exec-cmd.h @@ -10,7 +10,7 @@ void setup_path(void); const char **prepare_git_cmd(struct argv_array *out, const char **argv); int execv_git_cmd(const char **argv); /* NULL terminated */ LAST_ARG_MUST_BE_NULL -extern int execl_git_cmd(const char *cmd, ...); +int execl_git_cmd(const char *cmd, ...); char *system_path(const char *path); #endif /* GIT_EXEC_CMD_H */ diff --git a/git-compat-util.h b/git-compat-util.h index 337bc9a7c3..cc2cd27f30 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -448,13 +448,13 @@ struct strbuf; /* General helper functions */ void vreportf(const char *prefix, const char *err, va_list params); NORETURN void usage(const char *err); -extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2))); -extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2))); -extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); -extern int error(const char *err, ...) __attribute__((format (printf, 1, 2))); -extern int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); -extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); -extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); +NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2))); +NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2))); +NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); +int error(const char *err, ...) __attribute__((format (printf, 1, 2))); +int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); +void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); +void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); #ifndef NO_OPENSSL #ifdef APPLE_COMMON_CRYPTO @@ -769,7 +769,7 @@ FILE *git_fopen(const char*, const char*); #undef snprintf #endif #define snprintf git_snprintf -extern int git_snprintf(char *str, size_t maxsize, +int git_snprintf(char *str, size_t maxsize, const char *format, ...); #ifdef vsnprintf #undef vsnprintf @@ -855,7 +855,7 @@ void *xrealloc(void *ptr, size_t size); void *xcalloc(size_t nmemb, size_t size); void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset); void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset); -extern int xopen(const char *path, int flags, ...); +int xopen(const char *path, int flags, ...); ssize_t xread(int fd, void *buf, size_t len); ssize_t xwrite(int fd, const void *buf, size_t len); ssize_t xpread(int fd, void *buf, size_t len, off_t offset); @@ -966,7 +966,7 @@ static inline size_t xsize_t(off_t len) } __attribute__((format (printf, 3, 4))) -extern int xsnprintf(char *dst, size_t max, const char *fmt, ...); +int xsnprintf(char *dst, size_t max, const char *fmt, ...); #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 256 diff --git a/khash.h b/khash.h index 532109c87f..3d25667a82 100644 --- a/khash.h +++ b/khash.h @@ -70,13 +70,13 @@ static const double __ac_HASH_UPPER = 0.77; } kh_##name##_t; #define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \ - extern kh_##name##_t *kh_init_##name(void); \ - extern void kh_destroy_##name(kh_##name##_t *h); \ - extern void kh_clear_##name(kh_##name##_t *h); \ - extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \ - extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \ - extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \ - extern void kh_del_##name(kh_##name##_t *h, khint_t x); + kh_##name##_t *kh_init_##name(void); \ + void kh_destroy_##name(kh_##name##_t *h); \ + void kh_clear_##name(kh_##name##_t *h); \ + khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \ + int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \ + khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \ + void kh_del_##name(kh_##name##_t *h, khint_t x); #define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ SCOPE kh_##name##_t *kh_init_##name(void) { \ diff --git a/path.h b/path.h index ab9d8d86f2..0efbd4fb0d 100644 --- a/path.h +++ b/path.h @@ -13,19 +13,19 @@ struct strbuf; /* * Return a statically allocated path. */ -extern const char *mkpath(const char *fmt, ...) +const char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2))); /* * Return a path. */ -extern char *mkpathdup(const char *fmt, ...) +char *mkpathdup(const char *fmt, ...) __attribute__((format (printf, 1, 2))); /* * Construct a path and place the result in the provided buffer `buf`. */ -extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) +char *mksnpath(char *buf, size_t n, const char *fmt, ...) __attribute__((format (printf, 3, 4))); /* @@ -37,7 +37,7 @@ extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) * Constructs a path into the common git directory of repository `repo` and * append it in the provided buffer `sb`. */ -extern void strbuf_git_common_path(struct strbuf *sb, +void strbuf_git_common_path(struct strbuf *sb, const struct repository *repo, const char *fmt, ...) __attribute__((format (printf, 3, 4))); @@ -46,7 +46,7 @@ extern void strbuf_git_common_path(struct strbuf *sb, * Return a statically allocated path into the main repository's * (the_repository) common git directory. */ -extern const char *git_common_path(const char *fmt, ...) +const char *git_common_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); @@ -66,7 +66,7 @@ extern const char *git_common_path(const char *fmt, ...) /* * Return a path into the git directory of repository `repo`. */ -extern char *repo_git_path(const struct repository *repo, +char *repo_git_path(const struct repository *repo, const char *fmt, ...) __attribute__((format (printf, 2, 3))); @@ -74,7 +74,7 @@ extern char *repo_git_path(const struct repository *repo, * Construct a path into the git directory of repository `repo` and append it * to the provided buffer `sb`. */ -extern void strbuf_repo_git_path(struct strbuf *sb, +void strbuf_repo_git_path(struct strbuf *sb, const struct repository *repo, const char *fmt, ...) __attribute__((format (printf, 3, 4))); @@ -83,13 +83,13 @@ extern void strbuf_repo_git_path(struct strbuf *sb, * Return a statically allocated path into the main repository's * (the_repository) git directory. */ -extern const char *git_path(const char *fmt, ...) +const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); /* * Return a path into the main repository's (the_repository) git directory. */ -extern char *git_pathdup(const char *fmt, ...) +char *git_pathdup(const char *fmt, ...) __attribute__((format (printf, 1, 2))); /* @@ -97,14 +97,14 @@ extern char *git_pathdup(const char *fmt, ...) * and place it in the provided buffer `buf`, the contents of the buffer will * be overridden. */ -extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...) +char *git_path_buf(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* * Construct a path into the main repository's (the_repository) git directory * and append it to the provided buffer `sb`. */ -extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) +void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* @@ -112,7 +112,7 @@ extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) * * If the repository doesn't have a worktree NULL is returned. */ -extern char *repo_worktree_path(const struct repository *repo, +char *repo_worktree_path(const struct repository *repo, const char *fmt, ...) __attribute__((format (printf, 2, 3))); @@ -122,7 +122,7 @@ extern char *repo_worktree_path(const struct repository *repo, * * If the repository doesn't have a worktree nothing will be appended to `sb`. */ -extern void strbuf_repo_worktree_path(struct strbuf *sb, +void strbuf_repo_worktree_path(struct strbuf *sb, const struct repository *repo, const char *fmt, ...) __attribute__((format (printf, 3, 4))); @@ -131,7 +131,7 @@ extern void strbuf_repo_worktree_path(struct strbuf *sb, * Return a path into a submodule's git directory located at `path`. `path` * must only reference a submodule of the main repository (the_repository). */ -extern char *git_pathdup_submodule(const char *path, const char *fmt, ...) +char *git_pathdup_submodule(const char *path, const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* @@ -139,7 +139,7 @@ extern char *git_pathdup_submodule(const char *path, const char *fmt, ...) * append it to the provided buffer `sb`. `path` must only reference a * submodule of the main repository (the_repository). */ -extern int strbuf_git_path_submodule(struct strbuf *sb, const char *path, +int strbuf_git_path_submodule(struct strbuf *sb, const char *path, const char *fmt, ...) __attribute__((format (printf, 3, 4))); diff --git a/quote.h b/quote.h index 89f99e98fa..86c0d944b5 100644 --- a/quote.h +++ b/quote.h @@ -31,7 +31,7 @@ struct strbuf; void sq_quote_buf(struct strbuf *, const char *src); void sq_quote_argv(struct strbuf *, const char **argv); -extern void sq_quotef(struct strbuf *, const char *fmt, ...); +void sq_quotef(struct strbuf *, const char *fmt, ...); /* * These match their non-pretty variants, except that they avoid diff --git a/run-command.h b/run-command.h index 31f6f2e57f..f769e03f01 100644 --- a/run-command.h +++ b/run-command.h @@ -69,7 +69,7 @@ int run_command(struct child_process *); */ const char *find_hook(const char *name); LAST_ARG_MUST_BE_NULL -extern int run_hook_le(const char *const *env, const char *name, ...); +int run_hook_le(const char *const *env, const char *name, ...); int run_hook_ve(const char *const *env, const char *name, va_list args); #define RUN_COMMAND_NO_STDIN 1 diff --git a/trace.h b/trace.h index 57faf3530a..4ca2a5a63f 100644 --- a/trace.h +++ b/trace.h @@ -28,23 +28,23 @@ uint64_t trace_performance_enter(void); #ifndef HAVE_VARIADIC_MACROS __attribute__((format (printf, 1, 2))) -extern void trace_printf(const char *format, ...); +void trace_printf(const char *format, ...); __attribute__((format (printf, 2, 3))) -extern void trace_printf_key(struct trace_key *key, const char *format, ...); +void trace_printf_key(struct trace_key *key, const char *format, ...); __attribute__((format (printf, 2, 3))) -extern void trace_argv_printf(const char **argv, const char *format, ...); +void trace_argv_printf(const char **argv, const char *format, ...); void trace_strbuf(struct trace_key *key, const struct strbuf *data); /* Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled. */ __attribute__((format (printf, 2, 3))) -extern void trace_performance(uint64_t nanos, const char *format, ...); +void trace_performance(uint64_t nanos, const char *format, ...); /* Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled. */ __attribute__((format (printf, 2, 3))) -extern void trace_performance_since(uint64_t start, const char *format, ...); +void trace_performance_since(uint64_t start, const char *format, ...); __attribute__((format (printf, 1, 2))) void trace_performance_leave(const char *format, ...); @@ -132,18 +132,18 @@ void trace_performance_leave(const char *format, ...); /* backend functions, use non-*fl macros instead */ __attribute__((format (printf, 4, 5))) -extern void trace_printf_key_fl(const char *file, int line, struct trace_key *key, +void trace_printf_key_fl(const char *file, int line, struct trace_key *key, const char *format, ...); __attribute__((format (printf, 4, 5))) -extern void trace_argv_printf_fl(const char *file, int line, const char **argv, +void trace_argv_printf_fl(const char *file, int line, const char **argv, const char *format, ...); void trace_strbuf_fl(const char *file, int line, struct trace_key *key, const struct strbuf *data); __attribute__((format (printf, 4, 5))) -extern void trace_performance_fl(const char *file, int line, +void trace_performance_fl(const char *file, int line, uint64_t nanos, const char *fmt, ...); __attribute__((format (printf, 4, 5))) -extern void trace_performance_leave_fl(const char *file, int line, +void trace_performance_leave_fl(const char *file, int line, uint64_t nanos, const char *fmt, ...); static inline int trace_pass_fl(struct trace_key *key) { diff --git a/worktree.h b/worktree.h index ead36d6f54..2d6a1d207a 100644 --- a/worktree.h +++ b/worktree.h @@ -104,7 +104,7 @@ int is_worktree_being_bisected(const struct worktree *wt, const char *target); * Similar to git_path() but can produce paths for a specified * worktree instead of current one */ -extern const char *worktree_git_path(const struct worktree *wt, +const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...) __attribute__((format (printf, 2, 3))); -- cgit v1.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 --- archive.h | 10 ++++----- bisect.h | 14 ++++++------ branch.h | 2 +- builtin.h | 2 +- bulk-checkin.h | 4 ++-- cache.h | 42 ++++++++++++++++++------------------ checkout.h | 4 ++-- column.h | 4 ++-- commit.h | 44 +++++++++++++++++++------------------- config.h | 44 +++++++++++++++++++------------------- connect.h | 2 +- delta.h | 4 ++-- dir.h | 62 +++++++++++++++++++++++++++--------------------------- git-compat-util.h | 4 ++-- help.h | 6 +++--- http.h | 10 ++++----- khash.h | 6 +++--- lockfile.h | 2 +- ls-refs.h | 2 +- merge-blobs.h | 4 ++-- object-store.h | 16 +++++++------- oidmap.h | 2 +- pack.h | 2 +- packfile.h | 8 +++---- path.h | 10 ++++----- pkt-line.h | 4 ++-- ppc/sha1.c | 2 +- quote.h | 2 +- reachable.h | 4 ++-- reflog-walk.h | 12 +++++------ remote.h | 12 +++++------ replace-object.h | 2 +- serve.h | 2 +- sha1-lookup.h | 6 +++--- string-list.h | 2 +- sub-process.h | 6 +++--- submodule-config.h | 2 +- tag.h | 2 +- tempfile.h | 4 ++-- trace.h | 10 ++++----- upload-pack.h | 4 ++-- vcs-svn/svndiff.h | 2 +- worktree.h | 14 ++++++------ xdiff-interface.h | 2 +- 44 files changed, 202 insertions(+), 202 deletions(-) (limited to 'cache.h') diff --git a/archive.h b/archive.h index 5afc11d0f8..a7bdeea2c8 100644 --- a/archive.h +++ b/archive.h @@ -24,8 +24,8 @@ struct archiver_args { /* main api */ int write_archive(int argc, const char **argv, const char *prefix, - struct repository *repo, - const char *name_hint, int remote); + struct repository *repo, + const char *name_hint, int remote); const char *archive_format_from_filename(const char *filename); @@ -52,8 +52,8 @@ typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry); void *object_file_to_archive(const struct archiver_args *args, - const char *path, const struct object_id *oid, - unsigned int mode, enum object_type *type, - unsigned long *sizep); + const char *path, const struct object_id *oid, + unsigned int mode, enum object_type *type, + unsigned long *sizep); #endif /* ARCHIVE_H */ diff --git a/bisect.h b/bisect.h index 81ac43baa7..4e69a11ea8 100644 --- a/bisect.h +++ b/bisect.h @@ -12,13 +12,13 @@ struct repository; * best commit, as chosen by `find_all`. */ void find_bisection(struct commit_list **list, int *reaches, int *all, - int find_all); + int find_all); struct commit_list *filter_skipped(struct commit_list *list, - struct commit_list **tried, - int show_all, - int *count, - int *skipped_first); + struct commit_list **tried, + int show_all, + int *count, + int *skipped_first); #define BISECT_SHOW_ALL (1<<0) #define REV_LIST_QUIET (1<<1) @@ -32,8 +32,8 @@ struct rev_list_info { }; int bisect_next_all(struct repository *r, - const char *prefix, - int no_checkout); + const char *prefix, + int no_checkout); int estimate_bisect_steps(int all); diff --git a/branch.h b/branch.h index f1f74d21e4..6f38db14e9 100644 --- a/branch.h +++ b/branch.h @@ -92,6 +92,6 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree); * otherwise. */ int replace_each_worktree_head_symref(const char *oldref, const char *newref, - const char *logmsg); + const char *logmsg); #endif diff --git a/builtin.h b/builtin.h index 7627483f2f..a6d3c58fdd 100644 --- a/builtin.h +++ b/builtin.h @@ -111,7 +111,7 @@ struct fmt_merge_msg_opts { }; int fmt_merge_msg(struct strbuf *in, struct strbuf *out, - struct fmt_merge_msg_opts *); + struct fmt_merge_msg_opts *); /** * If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early diff --git a/bulk-checkin.h b/bulk-checkin.h index bf830e780d..b26f3dc3b7 100644 --- a/bulk-checkin.h +++ b/bulk-checkin.h @@ -7,8 +7,8 @@ #include "cache.h" int index_bulk_checkin(struct object_id *oid, - int fd, size_t size, enum object_type type, - const char *path, unsigned flags); + int fd, size_t size, enum object_type type, + const char *path, unsigned flags); void plug_bulk_checkin(void); void unplug_bulk_checkin(void); diff --git a/cache.h b/cache.h index 1f42d5ecb1..9f15fee85f 100644 --- a/cache.h +++ b/cache.h @@ -616,7 +616,7 @@ void setup_work_tree(void); * either 0 upon success and non-zero if no repository was found. */ int discover_git_directory(struct strbuf *commondir, - struct strbuf *gitdir); + struct strbuf *gitdir); const char *setup_git_directory_gently(int *); const char *setup_git_directory(void); char *prefix_path(const char *prefix, int len, const char *path); @@ -636,8 +636,8 @@ char *prefix_filename(const char *prefix, const char *path); int check_filename(const char *prefix, const char *name); void verify_filename(const char *prefix, - const char *name, - int diagnose_misspelt_rev); + const char *name, + int diagnose_misspelt_rev); void verify_non_filename(const char *prefix, const char *name); int path_inside_repo(const char *prefix, const char *path); @@ -645,7 +645,7 @@ int path_inside_repo(const char *prefix, const char *path); #define INIT_DB_EXIST_OK 0x0002 int init_db(const char *git_dir, const char *real_git_dir, - const char *template_dir, unsigned int flags); + const char *template_dir, unsigned int flags); void sanitize_stdfds(void); int daemonize(void); @@ -673,12 +673,12 @@ int daemonize(void); /* Initialize and use the cache information */ struct lock_file; void preload_index(struct index_state *index, - const struct pathspec *pathspec, - unsigned int refresh_flags); + const struct pathspec *pathspec, + unsigned int refresh_flags); int do_read_index(struct index_state *istate, const char *path, - int must_exist); /* for testting only! */ + int must_exist); /* for testting only! */ int read_index_from(struct index_state *, const char *path, - const char *gitdir); + const char *gitdir); int is_index_unborn(struct index_state *); /* For use with `write_locked_index()`. */ @@ -718,8 +718,8 @@ int unmerged_index(const struct index_state *); * to it. */ int repo_index_has_changes(struct repository *repo, - struct tree *tree, - struct strbuf *sb); + struct tree *tree, + struct strbuf *sb); int verify_path(const char *path, unsigned mode); int strcmp_offset(const char *s1, const char *s2, size_t *first_change); @@ -797,7 +797,7 @@ void *read_blob_data_from_index(const struct index_state *, const char *, unsign /* don't refresh_fsmonitor state or do stat comparison even if CE_FSMONITOR_VALID is true */ #define CE_MATCH_IGNORE_FSMONITOR 0X20 int is_racy_timestamp(const struct index_state *istate, - const struct cache_entry *ce); + const struct cache_entry *ce); int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int); int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int); @@ -821,7 +821,7 @@ void fill_stat_data(struct stat_data *sd, struct stat *st); */ int match_stat_data(const struct stat_data *sd, struct stat *st); int match_stat_data_racy(const struct index_state *istate, - const struct stat_data *sd, struct stat *st); + const struct stat_data *sd, struct stat *st); void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); @@ -1386,8 +1386,8 @@ int get_oid_treeish(const char *str, struct object_id *oid); int get_oid_blob(const char *str, struct object_id *oid); void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); enum get_oid_result get_oid_with_context(struct repository *repo, const char *str, - unsigned flags, struct object_id *oid, - struct object_context *oc); + unsigned flags, struct object_id *oid, + struct object_context *oc); typedef int each_abbrev_fn(const struct object_id *oid, void *); int for_each_abbrev(const char *prefix, each_abbrev_fn, void *); @@ -1469,7 +1469,7 @@ int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); #define INTERPRET_BRANCH_REMOTE (1<<1) #define INTERPRET_BRANCH_HEAD (1<<2) int interpret_branch_name(const char *str, int len, struct strbuf *, - unsigned allowed); + unsigned allowed); int get_oid_mb(const char *str, struct object_id *oid); int validate_headref(const char *ref); @@ -1480,12 +1480,12 @@ int name_compare(const char *name1, size_t len1, const char *name2, size_t len2) int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2); void *read_object_with_reference(const struct object_id *oid, - const char *required_type, - unsigned long *size, - struct object_id *oid_ret); + const char *required_type, + unsigned long *size, + struct object_id *oid_ret); struct object *peel_to_type(const char *name, int namelen, - struct object *o, enum object_type); + struct object *o, enum object_type); enum date_mode_type { DATE_NORMAL = 0, @@ -1542,8 +1542,8 @@ enum want_ident { const char *git_author_info(int); const char *git_committer_info(int); const char *fmt_ident(const char *name, const char *email, - enum want_ident whose_ident, - const char *date_str, int); + enum want_ident whose_ident, + const char *date_str, int); const char *fmt_name(enum want_ident); const char *ident_default_name(void); const char *ident_default_email(void); diff --git a/checkout.h b/checkout.h index a6f5180436..1152133bd7 100644 --- a/checkout.h +++ b/checkout.h @@ -9,7 +9,7 @@ * exists, NULL otherwise. */ const char *unique_tracking_name(const char *name, - struct object_id *oid, - int *dwim_remotes_matched); + struct object_id *oid, + int *dwim_remotes_matched); #endif /* CHECKOUT_H */ diff --git a/column.h b/column.h index 72cf539667..448c7440b3 100644 --- a/column.h +++ b/column.h @@ -29,7 +29,7 @@ struct column_options { struct option; int parseopt_column_callback(const struct option *, const char *, int); int git_column_config(const char *var, const char *value, - const char *command, unsigned int *colopts); + const char *command, unsigned int *colopts); int finalize_colopts(unsigned int *colopts, int stdout_is_tty); static inline int column_active(unsigned int colopts) { @@ -38,7 +38,7 @@ static inline int column_active(unsigned int colopts) struct string_list; void print_columns(const struct string_list *list, unsigned int colopts, - const struct column_options *opts); + const struct column_options *opts); int run_column_filter(int colopts, const struct column_options *); int stop_column_filter(void); diff --git a/commit.h b/commit.h index 40744e1bed..18f05c64d8 100644 --- a/commit.h +++ b/commit.h @@ -179,8 +179,8 @@ struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ int has_non_ascii(const char *text); const char *logmsg_reencode(const struct commit *commit, - char **commit_encoding, - const char *output_encoding); + char **commit_encoding, + const char *output_encoding); const char *repo_logmsg_reencode(struct repository *r, const struct commit *commit, char **commit_encoding, @@ -245,15 +245,15 @@ int unregister_shallow(const struct object_id *oid); int for_each_commit_graft(each_commit_graft_fn, void *); int is_repository_shallow(struct repository *r); struct commit_list *get_shallow_commits(struct object_array *heads, - int depth, int shallow_flag, int not_shallow_flag); + int depth, int shallow_flag, int not_shallow_flag); struct commit_list *get_shallow_commits_by_rev_list( int ac, const char **av, int shallow_flag, int not_shallow_flag); void set_alternate_shallow_file(struct repository *r, const char *path, int override); int write_shallow_commits(struct strbuf *out, int use_pack_protocol, - const struct oid_array *extra); + const struct oid_array *extra); void setup_alternate_shallow(struct lock_file *shallow_lock, - const char **alternate_shallow_file, - const struct oid_array *extra); + const char **alternate_shallow_file, + const struct oid_array *extra); const char *setup_temporary_shallow(const struct oid_array *extra); void advertise_shallow_grafts(int); @@ -276,8 +276,8 @@ void prepare_shallow_info(struct shallow_info *, struct oid_array *); void clear_shallow_info(struct shallow_info *); void remove_nonexistent_theirs_shallow(struct shallow_info *); void assign_shallow_commits_to_refs(struct shallow_info *info, - uint32_t **used, - int *ref_status); + uint32_t **used, + int *ref_status); int delayed_reachability_test(struct shallow_info *si, int c); #define PRUNE_SHOW_ONLY 1 #define PRUNE_QUICK 2 @@ -286,7 +286,7 @@ extern struct trace_key trace_shallow; int interactive_add(int argc, const char **argv, const char *prefix, int patch); int run_add_interactive(const char *revision, const char *patch_mode, - const struct pathspec *pathspec); + const struct pathspec *pathspec); struct commit_extra_header { struct commit_extra_header *next; @@ -296,19 +296,19 @@ struct commit_extra_header { }; void append_merge_tag_headers(struct commit_list *parents, - struct commit_extra_header ***tail); + struct commit_extra_header ***tail); int commit_tree(const char *msg, size_t msg_len, - const struct object_id *tree, - struct commit_list *parents, struct object_id *ret, - const char *author, const char *sign_commit); + const struct object_id *tree, + struct commit_list *parents, struct object_id *ret, + const char *author, const char *sign_commit); int commit_tree_extended(const char *msg, size_t msg_len, - const struct object_id *tree, - struct commit_list *parents, - struct object_id *ret, const char *author, - const char *sign_commit, - struct commit_extra_header *); + const struct object_id *tree, + struct commit_list *parents, + struct object_id *ret, const char *author, + const char *sign_commit, + struct commit_extra_header *); struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **); @@ -323,13 +323,13 @@ void free_commit_extra_headers(struct commit_extra_header *extra); * responsibility to parse further in this case! */ const char *find_commit_header(const char *msg, const char *key, - size_t *out_len); + size_t *out_len); /* Find the end of the log message, the right place for a new trailer. */ size_t ignore_non_trailer(const char *buf, size_t len); typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra, - void *cb_data); + void *cb_data); int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data); @@ -339,7 +339,7 @@ struct merge_remote_desc { }; struct merge_remote_desc *merge_remote_util(struct commit *); void set_merge_remote_desc(struct commit *commit, - const char *name, struct object *obj); + const char *name, struct object *obj); /* * Given "name" from the command line to merge, find the commit object @@ -349,7 +349,7 @@ void set_merge_remote_desc(struct commit *commit, struct commit *get_merge_parent(const char *name); int parse_signed_commit(const struct commit *commit, - struct strbuf *message, struct strbuf *signature); + struct strbuf *message, struct strbuf *signature); int remove_signature(struct strbuf *buf); /* diff --git a/config.h b/config.h index 1482b9b7fa..c275fe2284 100644 --- a/config.h +++ b/config.h @@ -71,22 +71,22 @@ typedef int (*config_fn_t)(const char *, const char *, void *); int git_default_config(const char *, const char *, void *); int git_config_from_file(config_fn_t fn, const char *, void *); int git_config_from_file_with_options(config_fn_t fn, const char *, - void *, - const struct config_options *); + void *, + const struct config_options *); int git_config_from_mem(config_fn_t fn, - const enum config_origin_type, - const char *name, - const char *buf, size_t len, - void *data, const struct config_options *opts); + const enum config_origin_type, + const char *name, + const char *buf, size_t len, + void *data, const struct config_options *opts); int git_config_from_blob_oid(config_fn_t fn, const char *name, - const struct object_id *oid, void *data); + const struct object_id *oid, void *data); void git_config_push_parameter(const char *text); int git_config_from_parameters(config_fn_t fn, void *data); void read_early_config(config_fn_t cb, void *data); void git_config(config_fn_t fn, void *); int config_with_options(config_fn_t fn, void *, - struct git_config_source *config_source, - const struct config_options *opts); + struct git_config_source *config_source, + const struct config_options *opts); int git_parse_ssize_t(const char *, ssize_t *); int git_parse_ulong(const char *, unsigned long *); int git_parse_maybe_bool(const char *); @@ -160,9 +160,9 @@ int git_config_include(const char *name, const char *value, void *data); * there is no subsection at all. */ int parse_config_key(const char *var, - const char *section, - const char **subsection, int *subsection_len, - const char **key); + const char *section, + const char **subsection, int *subsection_len, + const char **key); struct config_set_element { struct hashmap_entry ent; @@ -215,25 +215,25 @@ int git_configset_get_pathname(struct config_set *cs, const char *key, const cha struct repository; void repo_config(struct repository *repo, config_fn_t fn, void *data); int repo_config_get_value(struct repository *repo, - const char *key, const char **value); + const char *key, const char **value); const struct string_list *repo_config_get_value_multi(struct repository *repo, - const char *key); + const char *key); int repo_config_get_string_const(struct repository *repo, - const char *key, const char **dest); + const char *key, const char **dest); int repo_config_get_string(struct repository *repo, - const char *key, char **dest); + const char *key, char **dest); int repo_config_get_int(struct repository *repo, - const char *key, int *dest); + const char *key, int *dest); int repo_config_get_ulong(struct repository *repo, - const char *key, unsigned long *dest); + const char *key, unsigned long *dest); int repo_config_get_bool(struct repository *repo, - const char *key, int *dest); + const char *key, int *dest); int repo_config_get_bool_or_int(struct repository *repo, - const char *key, int *is_bool, int *dest); + const char *key, int *is_bool, int *dest); int repo_config_get_maybe_bool(struct repository *repo, - const char *key, int *dest); + const char *key, int *dest); int repo_config_get_pathname(struct repository *repo, - const char *key, const char **dest); + const char *key, const char **dest); int git_config_get_value(const char *key, const char **value); const struct string_list *git_config_get_value_multi(const char *key); diff --git a/connect.h b/connect.h index 61a005603a..5f2382e018 100644 --- a/connect.h +++ b/connect.h @@ -20,6 +20,6 @@ enum protocol_version discover_version(struct packet_reader *reader); int server_supports_v2(const char *c, int die_on_error); int server_supports_feature(const char *c, const char *feature, - int die_on_error); + int die_on_error); #endif diff --git a/delta.h b/delta.h index 0fc3659633..2df5fe13d9 100644 --- a/delta.h +++ b/delta.h @@ -76,8 +76,8 @@ diff_delta(const void *src_buf, unsigned long src_bufsize, * returned. The returned buffer must be freed by the caller. */ void *patch_delta(const void *src_buf, unsigned long src_size, - const void *delta_buf, unsigned long delta_size, - unsigned long *dst_size); + const void *delta_buf, unsigned long delta_size, + unsigned long *dst_size); /* the smallest possible delta size is 4 bytes */ #define DELTA_SIZE_MIN 4 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 diff --git a/git-compat-util.h b/git-compat-util.h index cc2cd27f30..eb3de5372f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -770,13 +770,13 @@ FILE *git_fopen(const char*, const char*); #endif #define snprintf git_snprintf int git_snprintf(char *str, size_t maxsize, - const char *format, ...); + const char *format, ...); #ifdef vsnprintf #undef vsnprintf #endif #define vsnprintf git_vsnprintf int git_vsnprintf(char *str, size_t maxsize, - const char *format, va_list ap); + const char *format, va_list ap); #endif #ifdef __GLIBC_PREREQ diff --git a/help.h b/help.h index ca004a7a7d..b8780fbd0f 100644 --- a/help.h +++ b/help.h @@ -27,12 +27,12 @@ void list_config_help(int for_human); void list_all_main_cmds(struct string_list *list); void list_all_other_cmds(struct string_list *list); void list_cmds_by_category(struct string_list *list, - const char *category); + const char *category); void list_cmds_by_config(struct string_list *list); const char *help_unknown_cmd(const char *cmd); void load_command_list(const char *prefix, - struct cmdnames *main_cmds, - struct cmdnames *other_cmds); + struct cmdnames *main_cmds, + struct cmdnames *other_cmds); void add_cmdname(struct cmdnames *cmds, const char *name, int len); /* Here we require that excludes is a sorted list. */ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes); diff --git a/http.h b/http.h index 32156bf7f1..c197e4ff79 100644 --- a/http.h +++ b/http.h @@ -104,7 +104,7 @@ void step_active_slots(void); #endif void http_init(struct remote *remote, const char *url, - int proactive_auth); + int proactive_auth); void http_cleanup(void); struct curl_slist *http_copy_default_headers(void); @@ -147,10 +147,10 @@ void normalize_curl_result(CURLcode *result, long http_code, char *errorstr, /* Helpers for modifying and creating URLs */ void append_remote_object_url(struct strbuf *buf, const char *url, - const char *hex, - int only_two_digit_prefix); + const char *hex, + int only_two_digit_prefix); char *get_remote_object_url(const char *url, const char *hex, - int only_two_digit_prefix); + int only_two_digit_prefix); /* Options for http_get_*() */ struct http_get_options { @@ -208,7 +208,7 @@ int http_fetch_ref(const char *base, struct ref *ref); /* Helpers for fetching packs */ int http_get_info_packs(const char *base_url, - struct packed_git **packs_head); + struct packed_git **packs_head); struct http_pack_request { char *url; diff --git a/khash.h b/khash.h index 3d25667a82..642c0e6e0c 100644 --- a/khash.h +++ b/khash.h @@ -69,11 +69,11 @@ static const double __ac_HASH_UPPER = 0.77; khval_t *vals; \ } kh_##name##_t; -#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \ - kh_##name##_t *kh_init_##name(void); \ +#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \ + kh_##name##_t *kh_init_##name(void); \ void kh_destroy_##name(kh_##name##_t *h); \ void kh_clear_##name(kh_##name##_t *h); \ - khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \ + khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \ int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \ khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \ void kh_del_##name(kh_##name##_t *h, khint_t x); diff --git a/lockfile.h b/lockfile.h index c81983a925..9843053ce8 100644 --- a/lockfile.h +++ b/lockfile.h @@ -189,7 +189,7 @@ static inline int is_lock_file_locked(struct lock_file *lk) * `errno` set by the failing call. */ void unable_to_lock_message(const char *path, int err, - struct strbuf *buf); + struct strbuf *buf); /* * Emit an appropriate error message and `die()` following the failure diff --git a/ls-refs.h b/ls-refs.h index 702d47ad70..7e5646f5f6 100644 --- a/ls-refs.h +++ b/ls-refs.h @@ -5,6 +5,6 @@ struct repository; struct argv_array; struct packet_reader; int ls_refs(struct repository *r, struct argv_array *keys, - struct packet_reader *request); + struct packet_reader *request); #endif /* LS_REFS_H */ diff --git a/merge-blobs.h b/merge-blobs.h index 863a7e0807..13cf9669e5 100644 --- a/merge-blobs.h +++ b/merge-blobs.h @@ -5,7 +5,7 @@ struct blob; struct index_state; void *merge_blobs(struct index_state *, const char *, - struct blob *, struct blob *, - struct blob *, unsigned long *); + struct blob *, struct blob *, + struct blob *, unsigned long *); #endif /* MERGE_BLOBS_H */ diff --git a/object-store.h b/object-store.h index 9700d1aca7..4a6ca2fd3a 100644 --- a/object-store.h +++ b/object-store.h @@ -163,9 +163,9 @@ void *map_loose_object(struct repository *r, const struct object_id *oid, unsigned long *size); void *read_object_file_extended(struct repository *r, - const struct object_id *oid, - enum object_type *type, - unsigned long *size, int lookup_replace); + const struct object_id *oid, + enum object_type *type, + unsigned long *size, int lookup_replace); static inline void *repo_read_object_file(struct repository *r, const struct object_id *oid, enum object_type *type, @@ -181,17 +181,17 @@ static inline void *repo_read_object_file(struct repository *r, int oid_object_info(struct repository *r, const struct object_id *, unsigned long *); int hash_object_file(const void *buf, unsigned long len, - const char *type, struct object_id *oid); + const char *type, struct object_id *oid); int write_object_file(const void *buf, unsigned long len, - const char *type, struct object_id *oid); + const char *type, struct object_id *oid); int hash_object_file_literally(const void *buf, unsigned long len, - const char *type, struct object_id *oid, - unsigned flags); + const char *type, struct object_id *oid, + unsigned flags); int pretend_object_file(void *, unsigned long, enum object_type, - struct object_id *oid); + struct object_id *oid); int force_object_loose(const struct object_id *oid, time_t mtime); diff --git a/oidmap.h b/oidmap.h index 91b2ed0f51..7a939461ff 100644 --- a/oidmap.h +++ b/oidmap.h @@ -47,7 +47,7 @@ void oidmap_free(struct oidmap *map, int free_entries); * Returns the oidmap entry for the specified oid, or NULL if not found. */ void *oidmap_get(const struct oidmap *map, - const struct object_id *key); + const struct object_id *key); /* * Adds or replaces an oidmap entry. diff --git a/pack.h b/pack.h index de941858c5..9fc0945ac9 100644 --- a/pack.h +++ b/pack.h @@ -93,7 +93,7 @@ char *index_pack_lockfile(int fd); */ #define MAX_PACK_OBJECT_HEADER 10 int encode_in_pack_object_header(unsigned char *hdr, int hdr_len, - enum object_type, uintmax_t); + enum object_type, uintmax_t); #define PH_ERROR_EOF (-1) #define PH_ERROR_PACK_SIGNATURE (-2) diff --git a/packfile.h b/packfile.h index 0e051ad5d3..f2d7dd2322 100644 --- a/packfile.h +++ b/packfile.h @@ -60,7 +60,7 @@ struct packed_git *get_all_packs(struct repository *r); unsigned long approximate_object_count(void); struct packed_git *find_sha1_pack(const unsigned char *sha1, - struct packed_git *packs); + struct packed_git *packs); void pack_report(void); @@ -144,8 +144,8 @@ void release_pack_memory(size_t); extern int do_check_packed_object_crc; int packed_object_info(struct repository *r, - struct packed_git *pack, - off_t offset, struct object_info *); + struct packed_git *pack, + off_t offset, struct object_info *); void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1); const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1); @@ -177,6 +177,6 @@ int is_promisor_object(const struct object_id *oid); * probably use open_pack_index() or parse_pack_index() instead. */ int load_idx(const char *path, const unsigned int hashsz, void *idx_map, - size_t idx_size, struct packed_git *p); + size_t idx_size, struct packed_git *p); #endif diff --git a/path.h b/path.h index 0efbd4fb0d..2ba6ca58c8 100644 --- a/path.h +++ b/path.h @@ -38,8 +38,8 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...) * append it in the provided buffer `sb`. */ void strbuf_git_common_path(struct strbuf *sb, - const struct repository *repo, - const char *fmt, ...) + const struct repository *repo, + const char *fmt, ...) __attribute__((format (printf, 3, 4))); /* @@ -67,7 +67,7 @@ const char *git_common_path(const char *fmt, ...) * Return a path into the git directory of repository `repo`. */ char *repo_git_path(const struct repository *repo, - const char *fmt, ...) + const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* @@ -75,8 +75,8 @@ char *repo_git_path(const struct repository *repo, * to the provided buffer `sb`. */ void strbuf_repo_git_path(struct strbuf *sb, - const struct repository *repo, - const char *fmt, ...) + const struct repository *repo, + const char *fmt, ...) __attribute__((format (printf, 3, 4))); /* diff --git a/pkt-line.h b/pkt-line.h index 1ebeaff236..5c62015db4 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -173,8 +173,8 @@ struct packet_reader { * abstraction around the 'packet_read_with_status()' function. */ void packet_reader_init(struct packet_reader *reader, int fd, - char *src_buffer, size_t src_len, - int options); + char *src_buffer, size_t src_len, + int options); /* * Perform a packet read and return the status of the read. diff --git a/ppc/sha1.c b/ppc/sha1.c index b5d8af4551..1b705cee1f 100644 --- a/ppc/sha1.c +++ b/ppc/sha1.c @@ -11,7 +11,7 @@ #include "sha1.h" void ppc_sha1_core(uint32_t *hash, const unsigned char *p, - unsigned int nblocks); + unsigned int nblocks); int ppc_SHA1_Init(ppc_SHA_CTX *c) { diff --git a/quote.h b/quote.h index 86c0d944b5..fb08dc085c 100644 --- a/quote.h +++ b/quote.h @@ -68,7 +68,7 @@ void quote_two_c_style(struct strbuf *, const char *, const char *, int); void write_name_quoted(const char *name, FILE *, int terminator); void write_name_quoted_relative(const char *name, const char *prefix, - FILE *fp, int terminator); + FILE *fp, int terminator); /* quote path as relative to the given prefix */ char *quote_path_relative(const char *in, const char *prefix, diff --git a/reachable.h b/reachable.h index aef2b877a5..5df932ad8f 100644 --- a/reachable.h +++ b/reachable.h @@ -5,8 +5,8 @@ struct progress; struct rev_info; int add_unseen_recent_objects_to_traversal(struct rev_info *revs, - timestamp_t timestamp); + timestamp_t timestamp); void mark_reachable_objects(struct rev_info *revs, int mark_reflog, - timestamp_t mark_recent, struct progress *); + timestamp_t mark_recent, struct progress *); #endif diff --git a/reflog-walk.h b/reflog-walk.h index c83597d1db..f26408f6cc 100644 --- a/reflog-walk.h +++ b/reflog-walk.h @@ -8,17 +8,17 @@ struct reflog_walk_info; void init_reflog_walk(struct reflog_walk_info **info); int add_reflog_for_walk(struct reflog_walk_info *info, - struct commit *commit, const char *name); + struct commit *commit, const char *name); void show_reflog_message(struct reflog_walk_info *info, int, - const struct date_mode *, int force_date); + const struct date_mode *, int force_date); void get_reflog_message(struct strbuf *sb, - struct reflog_walk_info *reflog_info); + struct reflog_walk_info *reflog_info); const char *get_reflog_ident(struct reflog_walk_info *reflog_info); timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info); void get_reflog_selector(struct strbuf *sb, - struct reflog_walk_info *reflog_info, - const struct date_mode *dmode, int force_date, - int shorten); + struct reflog_walk_info *reflog_info, + const struct date_mode *dmode, int force_date, + int shorten); int reflog_walk_empty(struct reflog_walk_info *walk); diff --git a/remote.h b/remote.h index 7b1eed6008..62bda7ef03 100644 --- a/remote.h +++ b/remote.h @@ -140,15 +140,15 @@ struct packet_reader; struct argv_array; struct string_list; struct ref **get_remote_heads(struct packet_reader *reader, - struct ref **list, unsigned int flags, - struct oid_array *extra_have, - struct oid_array *shallow_points); + struct ref **list, unsigned int flags, + struct oid_array *extra_have, + struct oid_array *shallow_points); /* Used for protocol v2 in order to retrieve refs from a remote */ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, - struct ref **list, int for_push, - const struct argv_array *ref_prefixes, - const struct string_list *server_options); + struct ref **list, int for_push, + const struct argv_array *ref_prefixes, + const struct string_list *server_options); int resolve_remote_symref(struct ref *ref, struct ref *list); diff --git a/replace-object.h b/replace-object.h index f438421e36..04ed7a85a2 100644 --- a/replace-object.h +++ b/replace-object.h @@ -17,7 +17,7 @@ void prepare_replace_object(struct repository *r); * lookup_replace_object(). Please do not call it directly. */ const struct object_id *do_lookup_replace_object(struct repository *r, - const struct object_id *oid); + const struct object_id *oid); /* * If object sha1 should be replaced, return the replacement object's diff --git a/serve.h b/serve.h index 48b6f5e479..42ddca7f8b 100644 --- a/serve.h +++ b/serve.h @@ -3,7 +3,7 @@ struct argv_array; int has_capability(const struct argv_array *keys, const char *capability, - const char **value); + const char **value); struct serve_options { unsigned advertise_capabilities; diff --git a/sha1-lookup.h b/sha1-lookup.h index 457c9b4964..5afcd011c6 100644 --- a/sha1-lookup.h +++ b/sha1-lookup.h @@ -4,9 +4,9 @@ typedef const unsigned char *sha1_access_fn(size_t index, void *table); int sha1_pos(const unsigned char *sha1, - void *table, - size_t nr, - sha1_access_fn fn); + void *table, + size_t nr, + sha1_access_fn fn); /* * Searches for sha1 in table, using the given fanout table to determine the diff --git a/string-list.h b/string-list.h index 7d9df61ac3..f964399949 100644 --- a/string-list.h +++ b/string-list.h @@ -175,7 +175,7 @@ struct string_list_item *string_list_insert(struct string_list *list, const char * doesn't exist, the list is not altered. */ void string_list_remove(struct string_list *list, const char *string, - int free_util); + int free_util); /** * Check if the given string is part of a sorted list. If it is part of the list, diff --git a/sub-process.h b/sub-process.h index 1653ae8afe..5c182fad98 100644 --- a/sub-process.h +++ b/sub-process.h @@ -43,9 +43,9 @@ struct subprocess_capability { /* Function to test two subprocess hashmap entries for equality. */ int cmd2process_cmp(const void *unused_cmp_data, - const void *e1, - const void *e2, - const void *unused_keydata); + const void *e1, + const void *e2, + const void *unused_keydata); /* * User-supplied function to initialize the sub-process. This is diff --git a/submodule-config.h b/submodule-config.h index a88ae7107f..1b4e2da658 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -36,7 +36,7 @@ int parse_submodule_fetchjobs(const char *var, const char *value); int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); struct option; int option_fetch_parse_recurse_submodules(const struct option *opt, - const char *arg, int unset); + const char *arg, int unset); int parse_update_recurse_submodules_arg(const char *opt, const char *arg); int parse_push_recurse_submodules_arg(const char *opt, const char *arg); void repo_read_gitmodules(struct repository *repo); diff --git a/tag.h b/tag.h index e57490485e..03265fbfe2 100644 --- a/tag.h +++ b/tag.h @@ -18,6 +18,6 @@ void release_tag_memory(struct tag *t); struct object *deref_tag(struct repository *r, struct object *, const char *, int); struct object *deref_tag_noverify(struct object *); int gpg_verify_tag(const struct object_id *oid, - const char *name_to_report, unsigned flags); + const char *name_to_report, unsigned flags); #endif /* TAG_H */ diff --git a/tempfile.h b/tempfile.h index 7b05d5765e..cddda0a33c 100644 --- a/tempfile.h +++ b/tempfile.h @@ -137,7 +137,7 @@ struct tempfile *register_tempfile(const char *path); /* See "mks_tempfile functions" above. */ struct tempfile *mks_tempfile_sm(const char *filename_template, - int suffixlen, int mode); + int suffixlen, int mode); /* See "mks_tempfile functions" above. */ static inline struct tempfile *mks_tempfile_s(const char *filename_template, @@ -160,7 +160,7 @@ static inline struct tempfile *mks_tempfile(const char *filename_template) /* See "mks_tempfile functions" above. */ struct tempfile *mks_tempfile_tsm(const char *filename_template, - int suffixlen, int mode); + int suffixlen, int mode); /* See "mks_tempfile functions" above. */ static inline struct tempfile *mks_tempfile_ts(const char *filename_template, diff --git a/trace.h b/trace.h index 4ca2a5a63f..9fa3e7a594 100644 --- a/trace.h +++ b/trace.h @@ -133,18 +133,18 @@ void trace_performance_leave(const char *format, ...); /* backend functions, use non-*fl macros instead */ __attribute__((format (printf, 4, 5))) void trace_printf_key_fl(const char *file, int line, struct trace_key *key, - const char *format, ...); + const char *format, ...); __attribute__((format (printf, 4, 5))) void trace_argv_printf_fl(const char *file, int line, const char **argv, - const char *format, ...); + const char *format, ...); void trace_strbuf_fl(const char *file, int line, struct trace_key *key, - const struct strbuf *data); + const struct strbuf *data); __attribute__((format (printf, 4, 5))) void trace_performance_fl(const char *file, int line, - uint64_t nanos, const char *fmt, ...); + uint64_t nanos, const char *fmt, ...); __attribute__((format (printf, 4, 5))) void trace_performance_leave_fl(const char *file, int line, - uint64_t nanos, const char *fmt, ...); + uint64_t nanos, const char *fmt, ...); static inline int trace_pass_fl(struct trace_key *key) { return key->fd || !key->initialized; diff --git a/upload-pack.h b/upload-pack.h index bc2ceb211c..4bafe16a22 100644 --- a/upload-pack.h +++ b/upload-pack.h @@ -14,10 +14,10 @@ struct repository; struct argv_array; struct packet_reader; int upload_pack_v2(struct repository *r, struct argv_array *keys, - struct packet_reader *request); + struct packet_reader *request); struct strbuf; int upload_pack_advertise(struct repository *r, - struct strbuf *value); + struct strbuf *value); #endif /* UPLOAD_PACK_H */ diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h index 023799a05c..625d950bb8 100644 --- a/vcs-svn/svndiff.h +++ b/vcs-svn/svndiff.h @@ -5,6 +5,6 @@ struct line_buffer; struct sliding_view; int svndiff0_apply(struct line_buffer *delta, off_t delta_len, - struct sliding_view *preimage, FILE *postimage); + struct sliding_view *preimage, FILE *postimage); #endif diff --git a/worktree.h b/worktree.h index 2d6a1d207a..caecc7a281 100644 --- a/worktree.h +++ b/worktree.h @@ -48,8 +48,8 @@ const char *get_worktree_git_dir(const struct worktree *wt); * "arg". "prefix" must not be NULL. */ struct worktree *find_worktree(struct worktree **list, - const char *prefix, - const char *arg); + const char *prefix, + const char *arg); /* * Return true if the given worktree is the main one. @@ -69,14 +69,14 @@ const char *worktree_lock_reason(struct worktree *wt); * returned if "errmsg" is not NULL. */ int validate_worktree(const struct worktree *wt, - struct strbuf *errmsg, - unsigned flags); + struct strbuf *errmsg, + unsigned flags); /* * Update worktrees/xxx/gitdir with the new path. */ void update_worktree_location(struct worktree *wt, - const char *path_); + const char *path_); /* * Free up the memory for worktree(s) @@ -89,7 +89,7 @@ void free_worktrees(struct worktree **); * or NULL otherwise. The result may be destroyed by the next call. */ const struct worktree *find_shared_symref(const char *symref, - const char *target); + const char *target); /* * Similar to head_ref() for all HEADs _except_ one from the current @@ -105,7 +105,7 @@ int is_worktree_being_bisected(const struct worktree *wt, const char *target); * worktree instead of current one */ const char *worktree_git_path(const struct worktree *wt, - const char *fmt, ...) + const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* 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.3