aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2015-08-14 12:47:21 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-08-14 15:46:51 +0200
commita420c7ce9b2c483c2f93b8a1a03cc80f3eeedb20 (patch)
tree4a85364eafb77706b78585fed09e3658d991fa7c
parenttree: move layout into page function (diff)
downloadcgit-a420c7ce9b2c483c2f93b8a1a03cc80f3eeedb20.tar.xz
cgit-a420c7ce9b2c483c2f93b8a1a03cc80f3eeedb20.zip
cmd: remove "want_layout" field
No commands use this any more. Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--cgit.c9
-rw-r--r--cmd.c48
-rw-r--r--cmd.h1
3 files changed, 24 insertions, 34 deletions
diff --git a/cgit.c b/cgit.c
index 3a97563..7271412 100644
--- a/cgit.c
+++ b/cgit.c
@@ -736,16 +736,7 @@ static void process_request(void)
if (cmd->pre)
cmd->pre();
- if (cmd->want_layout) {
- cgit_print_http_headers();
- cgit_print_docstart();
- cgit_print_pageheader();
- }
-
cmd->fn();
-
- if (cmd->want_layout)
- cgit_print_docend();
}
static int cmp_repos(const void *a, const void *b)
diff --git a/cmd.c b/cmd.c
index 3c90d0b..05494fe 100644
--- a/cmd.c
+++ b/cmd.c
@@ -145,34 +145,34 @@ static void tree_fn(void)
cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
}
-#define def_cmp(name, want_repo, want_layout, want_vpath, is_clone) \
- {#name, name##_fn, name##_pre, want_repo, want_layout, want_vpath, is_clone}
-#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \
- {#name, name##_fn, NULL, want_repo, want_layout, want_vpath, is_clone}
+#define def_cmp(name, want_repo, want_vpath, is_clone) \
+ {#name, name##_fn, name##_pre, want_repo, want_vpath, is_clone}
+#define def_cmd(name, want_repo, want_vpath, is_clone) \
+ {#name, name##_fn, NULL, want_repo, want_vpath, is_clone}
struct cgit_cmd *cgit_get_cmd(void)
{
static struct cgit_cmd cmds[] = {
- def_cmd(HEAD, 1, 0, 0, 1),
- def_cmd(atom, 1, 0, 0, 0),
- def_cmp(about, 0, 0, 0, 0),
- def_cmd(blob, 1, 0, 0, 0),
- def_cmd(commit, 1, 0, 1, 0),
- def_cmd(diff, 1, 0, 1, 0),
- def_cmd(info, 1, 0, 0, 1),
- def_cmd(log, 1, 0, 1, 0),
- def_cmd(ls_cache, 0, 0, 0, 0),
- def_cmd(objects, 1, 0, 0, 1),
- def_cmd(patch, 1, 0, 1, 0),
- def_cmd(plain, 1, 0, 0, 0),
- def_cmd(rawdiff, 1, 0, 1, 0),
- def_cmd(refs, 1, 0, 0, 0),
- def_cmd(repolist, 0, 0, 0, 0),
- def_cmd(snapshot, 1, 0, 0, 0),
- def_cmd(stats, 1, 0, 1, 0),
- def_cmd(summary, 1, 0, 0, 0),
- def_cmd(tag, 1, 0, 0, 0),
- def_cmd(tree, 1, 0, 1, 0),
+ def_cmd(HEAD, 1, 0, 1),
+ def_cmd(atom, 1, 0, 0),
+ def_cmp(about, 0, 0, 0),
+ def_cmd(blob, 1, 0, 0),
+ def_cmd(commit, 1, 1, 0),
+ def_cmd(diff, 1, 1, 0),
+ def_cmd(info, 1, 0, 1),
+ def_cmd(log, 1, 1, 0),
+ def_cmd(ls_cache, 0, 0, 0),
+ def_cmd(objects, 1, 0, 1),
+ def_cmd(patch, 1, 1, 0),
+ def_cmd(plain, 1, 0, 0),
+ def_cmd(rawdiff, 1, 1, 0),
+ def_cmd(refs, 1, 0, 0),
+ def_cmd(repolist, 0, 0, 0),
+ def_cmd(snapshot, 1, 0, 0),
+ def_cmd(stats, 1, 1, 0),
+ def_cmd(summary, 1, 0, 0),
+ def_cmd(tag, 1, 0, 0),
+ def_cmd(tree, 1, 1, 0),
};
int i;
diff --git a/cmd.h b/cmd.h
index 2507ca5..1a98089 100644
--- a/cmd.h
+++ b/cmd.h
@@ -9,7 +9,6 @@ struct cgit_cmd {
cgit_cmd_fn fn;
cgit_cmd_pre_fn pre;
unsigned int want_repo:1,
- want_layout:1,
want_vpath:1,
is_clone:1;
};