ui-log: make some variables 'static'

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 081f669a8a5c438265cfd39b1443e0ebf876f3db..16f809297fc40d9eedf95a80fcaf7e4caaefb26f 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -53,16 +53,28 @@ typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 typedef enum {
 typedef void (*linediff_fn)(char *line, int len);
 
 typedef enum {

-       ABOUT, COMMIT, SOURCE
+       DIFF_UNIFIED, DIFF_SSDIFF, DIFF_STATONLY
+} diff_type;
+
+typedef enum {
+       ABOUT, COMMIT, SOURCE, EMAIL, AUTH, OWNER

 } filter_type;
 
 struct cgit_filter {
 } filter_type;
 
 struct cgit_filter {

+       int (*open)(struct cgit_filter *, va_list ap);
+       int (*close)(struct cgit_filter *);
+       void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix);
+       void (*cleanup)(struct cgit_filter *);
+       int argument_count;
+};
+
+struct cgit_exec_filter {
+       struct cgit_filter base;

        char *cmd;
        char **argv;
        int old_stdout;
        int pipe_fh[2];
        int pid;
        char *cmd;
        char **argv;
        int old_stdout;
        int pipe_fh[2];
        int pid;

-       int exitstatus;

 };
 
 struct cgit_repo {
 };
 
 struct cgit_repo {


@@ -73,7 +85,7 @@ struct cgit_repo {
        char *owner;
        char *defbranch;
        char *module_link;
        char *owner;
        char *defbranch;
        char *module_link;

-       char *readme;
+       struct string_list readme;

        char *section;
        char *clone_url;
        char *logo;
        char *section;
        char *clone_url;
        char *logo;


@@ -85,12 +97,17 @@ struct cgit_repo {
        int enable_remote_branches;
        int enable_subject_links;
        int max_stats;
        int enable_remote_branches;
        int enable_subject_links;
        int max_stats;

+       int branch_sort;

        int commit_sort;
        time_t mtime;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
        int commit_sort;
        time_t mtime;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;

+       struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;

        struct string_list submodules;
        struct string_list submodules;

+       int hide;
+       int ignore;

 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,


@@ -140,7 +157,7 @@ struct reflist {
 struct cgit_query {
        int has_symref;
        int has_sha1;
 struct cgit_query {
        int has_symref;
        int has_sha1;

-       int has_ssdiff;
+       int has_difftype;

        char *raw;
        char *repo;
        char *page;
        char *raw;
        char *repo;
        char *page;


@@ -158,7 +175,7 @@ struct cgit_query {
        int nohead;
        char *sort;
        int showmsg;
        int nohead;
        char *sort;
        int showmsg;

-       int ssdiff;
+       diff_type difftype;

        int show_all;
        int context;
        int ignorews;
        int show_all;
        int context;
        int ignorews;


@@ -182,7 +199,7 @@ struct cgit_config {
        char *mimetype_file;
        char *module_link;
        char *project_list;
        char *mimetype_file;
        char *module_link;
        char *project_list;

-       char *readme;
+       struct string_list readme;

        char *robots;
        char *root_title;
        char *root_desc;
        char *robots;
        char *root_title;
        char *root_desc;


@@ -190,7 +207,7 @@ struct cgit_config {
        char *script_name;
        char *section;
        char *repository_sort;
        char *script_name;
        char *section;
        char *repository_sort;

-       char *virtual_root;
+       char *virtual_root;     /* Always ends with '/'. */

        char *strict_export;
        int cache_size;
        int cache_dynamic_ttl;
        char *strict_export;
        int cache_size;
        int cache_dynamic_ttl;


@@ -199,6 +216,8 @@ struct cgit_config {
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;

+       int cache_about_ttl;
+       int cache_snapshot_ttl;

        int case_sensitive_sort;
        int embedded;
        int enable_filter_overrides;
        int case_sensitive_sort;
        int embedded;
        int enable_filter_overrides;


@@ -233,25 +252,29 @@ struct cgit_config {
        int summary_branches;
        int summary_log;
        int summary_tags;
        int summary_branches;
        int summary_log;
        int summary_tags;

-       int ssdiff;
+       diff_type difftype;
+       int branch_sort;

        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;

+       struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;
+       struct cgit_filter *auth_filter;

 };
 
 struct cgit_page {
        time_t modified;
        time_t expires;
        size_t size;
 };
 
 struct cgit_page {
        time_t modified;
        time_t expires;
        size_t size;

-       char *mimetype;
-       char *charset;
-       char *filename;
-       char *etag;
-       char *title;
+       const char *mimetype;
+       const char *charset;
+       const char *filename;
+       const char *etag;
+       const char *title;

        int status;
        int status;

-       char *statusmsg;
+       const char *statusmsg;

 };
 
 struct cgit_environment {
 };
 
 struct cgit_environment {


@@ -265,6 +288,10 @@ struct cgit_environment {
        const char *script_name;
        const char *server_name;
        const char *server_port;
        const char *script_name;
        const char *server_name;
        const char *server_port;

+       const char *http_cookie;
+       const char *http_referer;
+       unsigned int content_length;
+       int authenticated;

 };
 
 struct cgit_context {
 };
 
 struct cgit_context {


@@ -300,9 +327,12 @@ extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 
 extern char *trim_end(const char *str, char c);
 extern int chk_non_negative(int result, char *msg);
 
 extern char *trim_end(const char *str, char c);

+extern char *ensure_end(const char *str, char c);

 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 

+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 char *refname, const unsigned char *sha1,
 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 char *refname, const unsigned char *sha1,


@@ -326,6 +356,9 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
 __attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
 __attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 

+__attribute__((format (printf,1,2)))
+extern char *fmtalloc(const char *format,...);
+

 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);


@@ -334,8 +367,13 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
 
 extern int cgit_parse_snapshots_mask(const char *str);
 

-extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_open_filter(struct cgit_filter *filter, ...);

 extern int cgit_close_filter(struct cgit_filter *filter);
 extern int cgit_close_filter(struct cgit_filter *filter);

+extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix);
+extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv);
+extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype);
+extern void cgit_cleanup_filters(void);
+extern void cgit_init_filters(void);

 
 extern void cgit_prepare_repo_env(struct cgit_repo * repo);
 
 
 extern void cgit_prepare_repo_env(struct cgit_repo * repo);