X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/1a2eeb94d42b983213076906eb5c5b85452b2c30..03de473354dc8c17a3b23a973b5cc67752ad20cb:/ui-snapshot.c diff --git a/ui-snapshot.c b/ui-snapshot.c index cb34f4b..f68e877 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -112,11 +112,13 @@ static int make_snapshot(const struct cgit_snapshot_format *format, unsigned char sha1[20]; if (get_sha1(hex, sha1)) { - cgit_print_error("Bad object id: %s", hex); + cgit_print_error_page(404, "Not found", + "Bad object id: %s", hex); return 1; } if (!lookup_commit_reference(sha1)) { - cgit_print_error("Not a commit reference: %s", hex); + cgit_print_error_page(400, "Bad request", + "Not a commit reference: %s", hex); return 1; } ctx.page.etag = sha1_to_hex(sha1); @@ -178,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) { @@ -200,20 +187,22 @@ 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; } if (!hex && dwim) { hex = get_ref_from_filename(ctx.repo->url, filename, f); if (hex == NULL) { - html_status(404, "Not found", 0); + cgit_print_error_page(404, "Not found", "Not found"); return; } prefix = xstrdup(filename);