cmd: remove "want_layout" field

No commands use this any more.

Signed-off-by: John Keeping <john@keeping.me.uk>

diff --git a/cgit.c b/cgit.c
index 3a97563c11fc5095fce52c63d57ca2a597160efd..727141232222310d0ad29eaf0797609c8953dc16 100644 (file)
--- 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 3c90d0b3c3b91718bacdc98cf30f3551ebe7afa4..05494fe145b92b030a65d2290c0c474368d00b08 100644 (file)
--- 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 2507ca57a7e95656f19ec276de7b939250ce8173..1a9808950b4be77732eb764ff519da237945dee5 100644 (file)
--- 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;
 };