cgit.c: remove useless null check

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index 0eb5ed5a4e6f10beeb4ce79519f78f08a15d2343..b7eccdd2bd982198df2971060002f3d6f155c783 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -3,6 +3,8 @@
 
 
 #include <git-compat-util.h>
+#include <stdbool.h>
+
 #include <cache.h>
 #include <grep.h>
 #include <object.h>
@@ -23,6 +25,9 @@
 #include <notes.h>
 #include <graph.h>
 
+/* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */
+#undef isgraph
+#define isgraph(x) (isprint((x)) && !isspace((x)))
 
 /*
  * Dateformats used on misc. pages
@@ -53,11 +58,11 @@ typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 typedef enum {
-       DIFF_UNIFIED, DIFF_SSDIFF
+       DIFF_UNIFIED, DIFF_SSDIFF, DIFF_STATONLY
 } diff_type;
 
 typedef enum {
-       ABOUT, COMMIT, SOURCE, EMAIL, AUTH
+       ABOUT, COMMIT, SOURCE, EMAIL, AUTH, OWNER
 } filter_type;
 
 struct cgit_filter {
@@ -104,7 +109,10 @@ struct cgit_repo {
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
        struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;
        struct string_list submodules;
+       int hide;
+       int ignore;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
@@ -176,6 +184,7 @@ struct cgit_query {
        int show_all;
        int context;
        int ignorews;
+       int follow;
        char *vpath;
 };
 
@@ -218,6 +227,7 @@ struct cgit_config {
        int case_sensitive_sort;
        int embedded;
        int enable_filter_overrides;
+       int enable_follow_links;
        int enable_http_clone;
        int enable_index_links;
        int enable_index_owner;
@@ -257,6 +267,7 @@ struct cgit_config {
        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;
 };
 
@@ -331,11 +342,14 @@ 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 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);
 
+void cgit_diff_tree_cb(struct diff_queue_struct *q,
+                      struct diff_options *options, void *data);
+
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,
@@ -377,4 +391,6 @@ extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);
 
+extern char *get_mimetype_for_filename(const char *filename);
+
 #endif /* CGIT_H */