Diffstat (limited to 'cgit.h')
| -rw-r--r-- | cgit.h | 58 |
1 files changed, 26 insertions, 32 deletions
@@ -1,35 +1,30 @@ #ifndef CGIT_H #define CGIT_H -#include <stdbool.h> #include <git-compat-util.h> +#include <stdbool.h> -#include <archive.h> -#include <commit.h> -#include <diffcore.h> -#include <diff.h> -#include <environment.h> -#include <graph.h> +#include <cache.h> #include <grep.h> -#include <hex.h> -#include <log-tree.h> -#include <notes.h> #include <object.h> -#include <object-name.h> -#include <odb.h> -#include <path.h> +#include <object-store.h> +#include <tree.h> +#include <commit.h> +#include <tag.h> +#include <diff.h> +#include <diffcore.h> +#include <strvec.h> #include <refs.h> #include <revision.h> -#include <setup.h> +#include <log-tree.h> +#include <archive.h> #include <string-list.h> -#include <strvec.h> -#include <tag.h> -#include <tree.h> -#include <utf8.h> -#include <wrapper.h> #include <xdiff-interface.h> #include <xdiff/xdiff.h> +#include <utf8.h> +#include <notes.h> +#include <graph.h> /* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */ #undef isgraph @@ -69,7 +64,7 @@ typedef enum { struct cgit_filter { int (*open)(struct cgit_filter *, va_list ap); int (*close)(struct cgit_filter *); - void (*fprintfp)(struct cgit_filter *, FILE *, const char *prefix); + void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix); void (*cleanup)(struct cgit_filter *); int argument_count; }; @@ -101,7 +96,6 @@ struct cgit_repo { int snapshots; int enable_blame; int enable_commit_graph; - int enable_follow_links; int enable_log_filecount; int enable_log_linecount; int enable_remote_branches; @@ -121,6 +115,9 @@ struct cgit_repo { int ignore; }; +typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, + const char *value); + struct cgit_repolist { int length; int count; @@ -167,7 +164,7 @@ struct reflist { struct cgit_query { int has_symref; - int has_oid; + int has_sha1; int has_difftype; char *raw; char *repo; @@ -175,8 +172,8 @@ struct cgit_query { char *search; char *grep; char *head; - char *oid; - char *oid2; + char *sha1; + char *sha2; char *path; char *name; char *url; @@ -198,6 +195,7 @@ struct cgit_config { char *cache_root; char *clone_prefix; char *clone_url; + char *css; char *favicon; char *footer; char *head_include; @@ -208,7 +206,6 @@ struct cgit_config { char *module_link; char *project_list; struct string_list readme; - struct string_list css; char *robots; char *root_title; char *root_desc; @@ -267,7 +264,6 @@ struct cgit_config { int branch_sort; int commit_sort; struct string_list mimetypes; - struct string_list js; struct cgit_filter *about_filter; struct cgit_filter *commit_filter; struct cgit_filter *source_filter; @@ -331,8 +327,7 @@ extern const struct cgit_snapshot_format cgit_snapshot_formats[]; extern char *cgit_default_repo_desc; extern struct cgit_repo *cgit_add_repo(const char *url); extern struct cgit_repo *cgit_get_repoinfo(const char *url); -extern void cgit_repo_config(struct cgit_repo *repo, const char *name, - const char *value); +extern void cgit_repo_config_cb(const char *name, const char *value); extern int chk_zero(int result, char *msg); extern int chk_positive(int result, char *msg); @@ -345,7 +340,8 @@ extern void strbuf_ensure_end(struct strbuf *sb, char c); extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); extern void cgit_free_reflist_inner(struct reflist *list); -extern int cgit_refs_cb(const struct reference *ref, void *cb_data); +extern int cgit_refs_cb(const char *refname, const struct object_id *oid, + int flags, void *cb_data); extern void cgit_free_commitinfo(struct commitinfo *info); extern void cgit_free_taginfo(struct taginfo *info); @@ -393,9 +389,7 @@ extern void cgit_init_filters(void); extern void cgit_prepare_repo_env(struct cgit_repo * repo); -extern int read_first_line(const char *path, char **buf, size_t *size); - -extern char *strdup_first_line(const char *txt); +extern int readfile(const char *path, char **buf, size_t *size); extern char *expand_macros(const char *txt); |