From mboxrd@z Thu Jan 1 00:00:00 1970 From: john at keeping.me.uk (John Keeping) Date: Sun, 5 Apr 2015 16:55:03 +0100 Subject: [PATCH 17/17] cmd: remove "want_layout" field In-Reply-To: References: Message-ID: <9da0c0e11b9076cc2a7989f4083ee2d0df8e6988.1428248621.git.john@keeping.me.uk> No commands use this any more. Signed-off-by: John Keeping --- cgit.c | 9 --------- cmd.c | 44 ++++++++++++++++++++++---------------------- cmd.h | 1 - 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/cgit.c b/cgit.c index 227c336..465b4c3 100644 --- a/cgit.c +++ b/cgit.c @@ -729,16 +729,7 @@ static void process_request(void) if (ctx.repo && prepare_repo_cmd()) return; - 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 6a964b1..d399f7d 100644 --- a/cmd.c +++ b/cmd.c @@ -136,32 +136,32 @@ static void tree_fn(void) cgit_print_tree(ctx.qry.sha1, ctx.qry.path); } -#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \ - {#name, name##_fn, want_repo, want_layout, want_vpath, is_clone} +#define def_cmd(name, want_repo, want_vpath, is_clone) \ + {#name, name##_fn, 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_cmd(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_cmd(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 752f078..6249b1d 100644 --- a/cmd.h +++ b/cmd.h @@ -7,7 +7,6 @@ struct cgit_cmd { const char *name; cgit_cmd_fn fn; unsigned int want_repo:1, - want_layout:1, want_vpath:1, is_clone:1; }; -- 2.4.0.rc0.173.gb1cefcc