doc: use consistent id's when generating html files

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index bf4bcd7b6fa9d90bbeadc6a6f548954bfe3134e2..b2d95f74a8753d785a7db52b2ad1d53b43f0d1b4 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
        /* argv_array guarantees a trailing NULL entry. */
        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
-       result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+       result = write_archive(argv.argc, nargv, NULL, NULL, 0);
        argv_array_clear(&argv);
        free(nargv);
        return result;
@@ -109,17 +109,19 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
                         const char *hex, const char *prefix,
                         const char *filename)
 {
-       unsigned char sha1[20];
+       struct object_id oid;
 
-       if (get_sha1(hex, sha1)) {
-               cgit_print_error("Bad object id: %s", hex);
+       if (get_oid(hex, &oid)) {
+               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);
+       if (!lookup_commit_reference(&oid)) {
+               cgit_print_error_page(400, "Bad request",
+                               "Not a commit reference: %s", hex);
                return 1;
        }
-       ctx.page.etag = sha1_to_hex(sha1);
+       ctx.page.etag = oid_to_hex(&oid);
        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);
        cgit_print_http_headers();
@@ -141,14 +143,14 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
                                         const struct cgit_snapshot_format *format)
 {
        const char *reponame;
-       unsigned char sha1[20];
+       struct object_id oid;
        struct strbuf snapshot = STRBUF_INIT;
        int result = 1;
 
        strbuf_addstr(&snapshot, filename);
        strbuf_setlen(&snapshot, snapshot.len - strlen(format->suffix));
 
-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)
                goto out;
 
        reponame = cgit_repobasename(url);
@@ -160,15 +162,15 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
                strbuf_splice(&snapshot, 0, new_start - snapshot.buf, "", 0);
        }
 
-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)
                goto out;
 
        strbuf_insert(&snapshot, 0, "v", 1);
-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)
                goto out;
 
        strbuf_splice(&snapshot, 0, 1, "V", 1);
-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)
                goto out;
 
        result = 0;
@@ -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,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;
        }