| -rw-r--r-- | filter.c | 4 | ||||
| -rw-r--r-- | ui-commit.c | 18 | ||||
| -rw-r--r-- | ui-repolist.c | 6 | ||||
| -rw-r--r-- | ui-summary.c | 8 |
4 files changed, 22 insertions, 14 deletions
@@ -351,8 +351,6 @@ int cgit_open_filter(struct cgit_filter *filter, ...) { int result; va_list ap; - if (!filter) - return 0; va_start(ap, filter); result = filter->open(filter, ap); va_end(ap); @@ -361,8 +359,6 @@ int cgit_open_filter(struct cgit_filter *filter, ...) int cgit_close_filter(struct cgit_filter *filter) { - if (!filter) - return 0; return filter->close(filter); } diff --git a/ui-commit.c b/ui-commit.c index 5ac79c0..aa1892f 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -107,22 +107,28 @@ void cgit_print_commit(char *hex, const char *prefix) } html("</table>\n"); html("<div class='commit-subject'>"); - cgit_open_filter(ctx.repo->commit_filter); + if (ctx.repo->commit_filter) + cgit_open_filter(ctx.repo->commit_filter); html_txt(info->subject); - cgit_close_filter(ctx.repo->commit_filter); + if (ctx.repo->commit_filter) + cgit_close_filter(ctx.repo->commit_filter); show_commit_decorations(commit); html("</div>"); html("<div class='commit-msg'>"); - cgit_open_filter(ctx.repo->commit_filter); + if (ctx.repo->commit_filter) + cgit_open_filter(ctx.repo->commit_filter); html_txt(info->msg); - cgit_close_filter(ctx.repo->commit_filter); + if (ctx.repo->commit_filter) + cgit_close_filter(ctx.repo->commit_filter); html("</div>"); if (notes.len != 0) { html("<div class='notes-header'>Notes</div>"); html("<div class='notes'>"); - cgit_open_filter(ctx.repo->commit_filter); + if (ctx.repo->commit_filter) + cgit_open_filter(ctx.repo->commit_filter); html_txt(notes.buf); - cgit_close_filter(ctx.repo->commit_filter); + if (ctx.repo->commit_filter) + cgit_close_filter(ctx.repo->commit_filter); html("</div>"); html("<div class='notes-footer'></div>"); } diff --git a/ui-repolist.c b/ui-repolist.c index f9cb21a..7b1fec3 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -333,7 +333,9 @@ void cgit_print_site_readme() { if (!ctx.cfg.root_readme) return; - cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme); + if (ctx.cfg.about_filter) + cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme); html_include(ctx.cfg.root_readme); - cgit_close_filter(ctx.cfg.about_filter); + if (ctx.cfg.about_filter) + cgit_close_filter(ctx.cfg.about_filter); } diff --git a/ui-summary.c b/ui-summary.c index ddd8f1b..725f3ab 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -151,12 +151,16 @@ void cgit_print_repo_readme(char *path) * filesystem, while applying the about-filter. */ html("<div id='summary'>"); - cgit_open_filter(ctx.repo->about_filter, filename); + if (ctx.repo->about_filter) + cgit_open_filter(ctx.repo->about_filter, filename); + if (ref) cgit_print_file(filename, ref, 1); else html_include(filename); - cgit_close_filter(ctx.repo->about_filter); + + if (ctx.repo->about_filter) + cgit_close_filter(ctx.repo->about_filter); html("</div>"); if (free_filename) |