[PATCH v2 09/22] snapshot: don't reimplement cgit_print_error_page()
John Keeping
john at keeping.me.uk
Fri Aug 14 13:47:09 CEST 2015
cgit_print_error_page() has the advantage that it sets a suitable HTTP
status code for the response. Note that setting "mimetype" is redundant
here since it cannot have changed since being initialized in
cgit.c::prepare_context(), so we do not need to worry that
cgit_print_error_page() does not set it.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
ui-snapshot.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 9bcf13d..f68e877 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -180,21 +180,6 @@ out:
return result ? strbuf_detach(&snapshot, NULL) : NULL;
}
-__attribute__((format (printf, 1, 2)))
-static void show_error(char *fmt, ...)
-{
- va_list ap;
-
- ctx.page.mimetype = "text/html";
- cgit_print_http_headers();
- cgit_print_docstart();
- cgit_print_pageheader();
- va_start(ap, fmt);
- cgit_vprint_error(fmt, ap);
- va_end(ap);
- cgit_print_docend();
-}
-
void cgit_print_snapshot(const char *head, const char *hex,
const char *filename, int dwim)
{
@@ -202,13 +187,15 @@ void cgit_print_snapshot(const char *head, const char *hex,
char *prefix = NULL;
if (!filename) {
- show_error("No snapshot name specified");
+ cgit_print_error_page(400, "Bad request",
+ "No snapshot name specified");
return;
}
f = get_format(filename);
if (!f) {
- show_error("Unsupported snapshot format: %s", filename);
+ cgit_print_error_page(400, "Bad request",
+ "Unsupported snapshot format: %s", filename);
return;
}
--
2.5.0.466.g9af26fa
More information about the CGit
mailing list