]> granicus.if.org Git - cgit/commitdiff
snapshot: don't reimplement cgit_print_error_page()
authorJohn Keeping <john@keeping.me.uk>
Fri, 14 Aug 2015 11:47:09 +0000 (12:47 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Fri, 14 Aug 2015 13:46:51 +0000 (15:46 +0200)
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@keeping.me.uk>
ui-snapshot.c

index 9bcf13d2b835d8c4536a2986b17f5a622d725418..f68e877fb2e5db33d20bf1bf3575fa9b57fa0558 100644 (file)
@@ -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;
        }