fix building with clang

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index bef6e5fbf2640a433f5571a3601cc37bc3ab01ce..e0d286d496c407ef3c42118857b11a0e9b47cf5e 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -1,29 +1,35 @@
 #ifndef CGIT_H
 #define CGIT_H
 
+#include <stdbool.h>
 
 #include <git-compat-util.h>
-#include <stdbool.h>
 
-#include <cache.h>
-#include <grep.h>
-#include <object.h>
-#include <tree.h>
+#include <archive.h>
 #include <commit.h>
-#include <tag.h>
-#include <diff.h>
 #include <diffcore.h>
-#include <argv-array.h>
+#include <diff.h>
+#include <environment.h>
+#include <graph.h>
+#include <grep.h>
+#include <hex.h>
+#include <log-tree.h>
+#include <notes.h>
+#include <object.h>
+#include <object-name.h>
+#include <object-store.h>
+#include <path.h>
 #include <refs.h>
 #include <revision.h>
-#include <log-tree.h>
-#include <archive.h>
+#include <setup.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
@@ -46,6 +52,8 @@
  */
 #define PAGE_ENCODING "UTF-8"
 
+#define BIT(x) (1U << (x))
+
 typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
@@ -61,7 +69,7 @@ typedef enum {
 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 (*fprintfp)(struct cgit_filter *, FILE *, const char *prefix);
        void (*cleanup)(struct cgit_filter *);
        int argument_count;
 };
@@ -71,7 +79,6 @@ struct cgit_exec_filter {
        char *cmd;
        char **argv;
        int old_stdout;
-       int pipe_fh[2];
        int pid;
 };
 
@@ -80,6 +87,7 @@ struct cgit_repo {
        char *name;
        char *path;
        char *desc;
+       char *extra_head_content;
        char *owner;
        char *homepage;
        char *defbranch;
@@ -89,7 +97,9 @@ struct cgit_repo {
        char *clone_url;
        char *logo;
        char *logo_link;
+       char *snapshot_prefix;
        int snapshots;
+       int enable_blame;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
@@ -159,7 +169,7 @@ struct reflist {
 
 struct cgit_query {
        int has_symref;
-       int has_sha1;
+       int has_oid;
        int has_difftype;
        char *raw;
        char *repo;
@@ -167,8 +177,8 @@ struct cgit_query {
        char *search;
        char *grep;
        char *head;
-       char *sha1;
-       char *sha2;
+       char *oid;
+       char *oid2;
        char *path;
        char *name;
        char *url;
@@ -190,19 +200,17 @@ struct cgit_config {
        char *cache_root;
        char *clone_prefix;
        char *clone_url;
-       char *css;
        char *favicon;
        char *footer;
        char *head_include;
        char *header;
-       char *index_header;
-       char *index_info;
        char *logo;
        char *logo_link;
        char *mimetype_file;
        char *module_link;
        char *project_list;
        struct string_list readme;
+       struct string_list css;
        char *robots;
        char *root_title;
        char *root_desc;
@@ -228,6 +236,7 @@ struct cgit_config {
        int enable_http_clone;
        int enable_index_links;
        int enable_index_owner;
+       int enable_blame;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
@@ -245,7 +254,6 @@ struct cgit_config {
        int max_repodesc_len;
        int max_blob_size;
        int max_stats;
-       int nocache;
        int noplainemail;
        int noheader;
        int renamelimit;
@@ -261,6 +269,7 @@ 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;
@@ -313,7 +322,6 @@ struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;
-       int bit;
 };
 
 extern const char *cgit_version;
@@ -333,7 +341,6 @@ 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 void strbuf_ensure_end(struct strbuf *sb, char c);
 
@@ -374,6 +381,9 @@ extern void cgit_parse_url(const char *url);
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
+extern const struct object_id *cgit_snapshot_get_sig(const char *ref,
+                                                    const struct cgit_snapshot_format *f);
+extern const unsigned cgit_snapshot_format_bit(const struct cgit_snapshot_format *f);
 
 extern int cgit_open_filter(struct cgit_filter *filter, ...);
 extern int cgit_close_filter(struct cgit_filter *filter);