Commit 5ade0344 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'en/incl-forward-decl'

Code hygiene improvement for the header files.

* en/incl-forward-decl:
  Remove forward declaration of an enum
  compat/precompose_utf8.h: use more common include guard style
  urlmatch.h: fix include guard
  Move definition of enum branch_track from cache.h to branch.h
  alloc: make allocate_alloc_state and clear_alloc_state more consistent
  Add missing includes and forward declarations
parents 36f0f344 1076f1e4
......@@ -36,7 +36,7 @@ struct alloc_state {
int slab_nr, slab_alloc;
};
void *allocate_alloc_state(void)
struct alloc_state *allocate_alloc_state(void)
{
return xcalloc(1, sizeof(struct alloc_state));
}
......
#ifndef ALLOC_H
#define ALLOC_H
struct alloc_state;
struct tree;
struct commit;
struct tag;
struct repository;
void *alloc_blob_node(struct repository *r);
void *alloc_tree_node(struct repository *r);
......@@ -13,7 +15,7 @@ void *alloc_object_node(struct repository *r);
void alloc_report(struct repository *r);
unsigned int alloc_commit_index(struct repository *r);
void *allocate_alloc_state(void);
struct alloc_state *allocate_alloc_state(void);
void clear_alloc_state(struct alloc_state *s);
#endif
#ifndef APPLY_H
#define APPLY_H
#include "lockfile.h"
#include "string-list.h"
struct repository;
enum apply_ws_error_action {
......
#ifndef ARCHIVE_H
#define ARCHIVE_H
#include "cache.h"
#include "pathspec.h"
struct repository;
......
......@@ -9,6 +9,7 @@ struct git_attr;
/* opaque structures used internally for attribute collection */
struct all_attrs_item;
struct attr_stack;
struct index_state;
/*
* Given a string, return the gitattribute object that
......
#ifndef BISECT_H
#define BISECT_H
struct commit_list;
/*
* Find bisection. If something is found, `reaches` will be the number of
* commits that the best commit reaches. `all` will be the count of
......
#ifndef BRANCH_H
#define BRANCH_H
struct strbuf;
enum branch_track {
BRANCH_TRACK_UNSPECIFIED = -1,
BRANCH_TRACK_NEVER = 0,
BRANCH_TRACK_REMOTE,
BRANCH_TRACK_ALWAYS,
BRANCH_TRACK_EXPLICIT,
BRANCH_TRACK_OVERRIDE
};
extern enum branch_track git_branch_track;
/* Functions for acting on the information about branches. */
/*
......
......@@ -4,6 +4,8 @@
#ifndef BULK_CHECKIN_H
#define BULK_CHECKIN_H
#include "cache.h"
extern int index_bulk_checkin(struct object_id *oid,
int fd, size_t size, enum object_type type,
const char *path, unsigned flags);
......
......@@ -917,15 +917,6 @@ enum log_refs_config {
};
extern enum log_refs_config log_all_ref_updates;
enum branch_track {
BRANCH_TRACK_UNSPECIFIED = -1,
BRANCH_TRACK_NEVER = 0,
BRANCH_TRACK_REMOTE,
BRANCH_TRACK_ALWAYS,
BRANCH_TRACK_EXPLICIT,
BRANCH_TRACK_OVERRIDE
};
enum rebase_setup_type {
AUTOREBASE_NEVER = 0,
AUTOREBASE_LOCAL,
......@@ -942,7 +933,6 @@ enum push_default_type {
PUSH_DEFAULT_UNSPECIFIED
};
extern enum branch_track git_branch_track;
extern enum rebase_setup_type autorebase;
extern enum push_default_type push_default;
......
......@@ -36,6 +36,7 @@ static inline int column_active(unsigned int colopts)
return (colopts & COL_ENABLE_MASK) == COL_ENABLED;
}
struct string_list;
extern void print_columns(const struct string_list *list, unsigned int colopts,
const struct column_options *opts);
......
......@@ -4,6 +4,7 @@
#include "git-compat-util.h"
#include "repository.h"
#include "string-list.h"
#include "cache.h"
struct commit;
......
#ifndef PRECOMPOSE_UNICODE_H
#define PRECOMPOSE_UNICODE_H
#include <sys/stat.h>
#include <sys/types.h>
#include <dirent.h>
......@@ -41,5 +43,4 @@ int precompose_utf8_closedir(PREC_DIR *dirp);
#define DIR PREC_DIR
#endif /* PRECOMPOSE_UNICODE_C */
#define PRECOMPOSE_UNICODE_H
#endif /* PRECOMPOSE_UNICODE_H */
......@@ -6,6 +6,7 @@
*
*/
#include "cache.h"
#include "branch.h"
#include "config.h"
#include "repository.h"
#include "lockfile.h"
......
#ifndef CONFIG_H
#define CONFIG_H
#include "hashmap.h"
#include "string-list.h"
struct object_id;
/* git_config_parse_key() returns these negated: */
#define CONFIG_INVALID_KEY 1
#define CONFIG_NO_SECTION_OR_NAME 2
......
#ifndef CONNECTED_H
#define CONNECTED_H
struct object_id;
struct transport;
/*
......
......@@ -7,6 +7,8 @@
#include "string-list.h"
struct index_state;
struct object_id;
struct strbuf;
#define CONV_EOL_RNDTRP_DIE (1<<0) /* Die if CRLF to LF to CRLF is different */
#define CONV_EOL_RNDTRP_WARN (1<<1) /* Warn if CRLF to LF to CRLF is different */
......
#ifndef CSUM_FILE_H
#define CSUM_FILE_H
#include "hash.h"
struct progress;
/* A SHA1-protected file */
......
......@@ -4,6 +4,10 @@
#ifndef DIFFCORE_H
#define DIFFCORE_H
#include "cache.h"
struct diff_options;
/* This header file is internal between diff.c and its diff transformers
* (e.g. diffcore-rename, diffcore-pickaxe). Never include this header
* in anything else.
......
#ifndef DIR_ITERATOR_H
#define DIR_ITERATOR_H
#include "strbuf.h"
/*
* Iterate over a directory tree.
*
......
......@@ -8,6 +8,7 @@
* are.
*/
#include "cache.h"
#include "branch.h"
#include "repository.h"
#include "config.h"
#include "refs.h"
......
......@@ -6,6 +6,7 @@
#define FSCK_IGNORE 3
struct fsck_options;
struct object;
void fsck_set_msg_type(struct fsck_options *options,
const char *msg_id, const char *msg_type);
......
#ifndef FSMONITOR_H
#define FSMONITOR_H
#include "cache.h"
#include "dir.h"
extern struct trace_key trace_fsmonitor;
/*
......
#ifndef GPG_INTERFACE_H
#define GPG_INTERFACE_H
struct strbuf;
#define GPG_VERIFY_VERBOSE 1
#define GPG_VERIFY_RAW 2
#define GPG_VERIFY_OMIT_STATUS 4
......
......@@ -26,6 +26,9 @@
#ifndef __AC_KHASH_H
#define __AC_KHASH_H
#include "cache.h"
#include "hashmap.h"
#define AC_VERSION_KHASH_H "0.2.8"
typedef uint32_t khint32_t;
......
#ifndef LIST_OBJECTS_FILTER_H
#define LIST_OBJECTS_FILTER_H
struct list_objects_filter_options;
struct object;
struct oidset;
/*
* During list-object traversal we allow certain objects to be
* filtered (omitted) from the result. The active filter uses
......
#ifndef LIST_OBJECTS_H
#define LIST_OBJECTS_H
struct commit;
struct object;
struct rev_info;
typedef void (*show_commit_fn)(struct commit *, void *);
typedef void (*show_object_fn)(struct object *, const char *, void *);
void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
......
......@@ -5,6 +5,8 @@
#ifndef LL_MERGE_H
#define LL_MERGE_H
#include "xdiff/xdiff.h"
struct ll_merge_options {
unsigned virtual_ancestor : 1;
unsigned variant : 2; /* favor ours, favor theirs, or union merge */
......
#ifndef MAILINFO_H
#define MAILINFO_H
#include "strbuf.h"
#define MAX_BOUNDARIES 5
struct mailinfo {
......
#ifndef MAILMAP_H
#define MAILMAP_H
struct string_list;
int read_mailmap(struct string_list *map, char **repo_abbrev);
void clear_mailmap(struct string_list *map);
......
#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H
#include "unpack-trees.h"
#include "string-list.h"
#include "unpack-trees.h"
struct commit;
struct merge_options {
const char *ancestor;
......
......@@ -2,6 +2,10 @@
#define NOTES_MERGE_H
#include "notes-utils.h"
#include "strbuf.h"
struct commit;
struct object_id;
#define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"
......
......@@ -3,6 +3,9 @@
#include "notes.h"
struct commit_list;
struct object_id;
/*
* Create new notes commit from the given notes tree
*
......
......@@ -3,6 +3,9 @@
#include "string-list.h"
struct object_id;
struct strbuf;
/*
* Function type for combining two notes annotating the same object.
*
......
#ifndef OBJECT_STORE_H
#define OBJECT_STORE_H
#include "cache.h"
#include "oidmap.h"
#include "list.h"
#include "sha1-array.h"
......
#ifndef OBJECT_H
#define OBJECT_H
#include "cache.h"
struct buffer_slab;
struct parsed_object_pool {
......
#ifndef OIDMAP_H
#define OIDMAP_H
#include "cache.h"
#include "hashmap.h"
/*
......
......@@ -5,6 +5,9 @@
#include "khash.h"
#include "pack-objects.h"
struct commit;
struct rev_info;
struct bitmap_disk_header {
char magic[4];
uint16_t version;
......
......@@ -2,6 +2,7 @@
#define PACK_OBJECTS_H
#include "object-store.h"
#include "pack.h"
#define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
......
#ifndef PATCH_IDS_H
#define PATCH_IDS_H
#include "diff.h"
#include "hashmap.h"
struct commit;
struct object_id;
struct patch_id {
struct hashmap_entry ent;
struct object_id patch_id;
......
......@@ -2,6 +2,7 @@
#define PATH_H
struct repository;
struct strbuf;
/*
* The result to all functions which return statically allocated memory may be
......
#ifndef PATHSPEC_H
#define PATHSPEC_H
struct index_state;
/* Pathspec magic */
#define PATHSPEC_FROMTOP (1<<0)
#define PATHSPEC_MAXDEPTH (1<<1)
......
#ifndef PRETTY_H
#define PRETTY_H
#include "cache.h"
#include "string-list.h"
struct commit;
struct strbuf;
/* Commit formats */
enum cmit_fmt {
......
......@@ -2,6 +2,8 @@
#define REACHEABLE_H
struct progress;
struct rev_info;
extern int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
timestamp_t timestamp);
extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
......
......@@ -3,6 +3,7 @@
#include "cache.h"
struct commit;
struct reflog_walk_info;
extern void init_reflog_walk(struct reflog_walk_info **info);
......
......@@ -3,8 +3,10 @@
struct object_id;
struct ref_store;
struct repository;
struct strbuf;
struct string_list;
struct string_list_item;
struct worktree;
/*
......
#ifndef REMOTE_H
#define REMOTE_H
#include "cache.h"
#include "parse-options.h"
#include "hashmap.h"
#include "refspec.h"
......
#ifndef REPOSITORY_H
#define REPOSITORY_H
#include "path.h"
struct config_set;
struct git_hash_algo;
struct index_state;
......
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H
#include "cache.h"
struct resolve_undo_info {
unsigned int mode[3];
struct object_id oid[3];
......
#ifndef REVISION_H
#define REVISION_H
#include "commit.h"
#include "parse-options.h"
#include "grep.h"
#include "notes.h"
......
......@@ -3,6 +3,10 @@
#include "string-list.h"
struct child_process;
struct oid_array;
struct ref;
/* Possible values for push_cert field in send_pack_args. */
#define SEND_PACK_PUSH_CERT_NEVER 0
#define SEND_PACK_PUSH_CERT_IF_ASKED 1
......
#ifndef SEQUENCER_H
#define SEQUENCER_H
#include "cache.h"
#include "strbuf.h"
struct commit;
const char *git_path_commit_editmsg(void);
const char *git_path_seq_dir(void);
......
......@@ -3,6 +3,8 @@
#include "string-list.h"
struct commit;
struct shortlog {
struct string_list list;
int summary;
......
#ifndef SUBMODULE_H
#define SUBMODULE_H
struct repository;
struct diff_options;
struct argv_array;
struct cache_entry;
struct diff_options;
struct index_state;
struct object_id;
struct oid_array;
struct pathspec;
struct remote;
struct repository;
struct string_list;
struct strbuf;
enum {
RECURSE_SUBMODULES_ONLY = -5,
......
......@@ -2,6 +2,7 @@
#define TEMPFILE_H
#include "list.h"
#include "strbuf.h"
/*
* Handle temporary files.
......
......@@ -3,6 +3,8 @@
#include "list.h"
struct strbuf;
enum trailer_where {
WHERE_DEFAULT,
WHERE_END,
......
#ifndef TREE_WALK_H
#define TREE_WALK_H
struct strbuf;
struct name_entry {
const struct object_id *oid;
const char *path;
......
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H
#include "tree-walk.h"
#include "cache.h"
#include "argv-array.h"
#include "string-list.h"
#include "tree-walk.h"
#define MAX_UNPACK_TREES 8
struct cache_entry;
struct unpack_trees_options;
struct exclude_list;
......
#ifndef URL_H
#define URL_H
struct strbuf;
extern int is_url(const char *url);
extern int is_urlschemechar(int first_flag, int ch);
extern char *url_decode(const char *url);
......
#ifndef URL_MATCH_H
#define URL_MATCH_H
#include "string-list.h"
struct url_info {
......
#ifndef GIT_UTF8_H
#define GIT_UTF8_H
struct strbuf;
typedef unsigned int ucs_char_t; /* assuming 32bit int */
size_t display_mode_esc_sequence_len(const char *s);
......
#ifndef WORKTREE_H
#define WORKTREE_H
#include "cache.h"
#include "refs.h"
struct strbuf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment