Remove redundant calls to fmt("%s", ...)

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 281899de0b01222d1e9453c3ca7385151334fec9..a47884e85556ff75d24364f67f441994d339ca7b 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,12 +8,14 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-snapshot.h"

 #include "html.h"
 #include "ui-shared.h"
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
        struct argv_array argv = ARGV_ARRAY_INIT;
 #include "html.h"
 #include "ui-shared.h"
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
        struct argv_array argv = ARGV_ARRAY_INIT;

+       argv_array_push(&argv, "snapshot");

        argv_array_push(&argv, format);
        if (prefix) {
                argv_array_push(&argv, "--prefix");
        argv_array_push(&argv, format);
        if (prefix) {
                argv_array_push(&argv, "--prefix");


@@ -98,11 +100,11 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
        unsigned char sha1[20];
 
        if (get_sha1(hex, sha1)) {
        unsigned char sha1[20];
 
        if (get_sha1(hex, sha1)) {

-               cgit_print_error(fmt("Bad object id: %s", hex));
+               cgit_print_error("Bad object id: %s", hex);

                return 1;
        }
        if (!lookup_commit_reference(sha1)) {
                return 1;
        }
        if (!lookup_commit_reference(sha1)) {

-               cgit_print_error(fmt("Not a commit reference: %s", hex));
+               cgit_print_error("Not a commit reference: %s", hex);

                return 1;
        }
        ctx.page.mimetype = xstrdup(format->mimetype);
                return 1;
        }
        ctx.page.mimetype = xstrdup(format->mimetype);


@@ -152,13 +154,18 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
        return NULL;
 }
 
        return NULL;
 }
 

-void show_error(char *msg)
+__attribute__((format (printf, 1, 2)))
+static void show_error(char *fmt, ...)

 {
 {

+       va_list ap;
+

        ctx.page.mimetype = "text/html";
        cgit_print_http_headers(&ctx);
        cgit_print_docstart(&ctx);
        cgit_print_pageheader(&ctx);
        ctx.page.mimetype = "text/html";
        cgit_print_http_headers(&ctx);
        cgit_print_docstart(&ctx);
        cgit_print_pageheader(&ctx);

-       cgit_print_error(msg);
+       va_start(ap, fmt);
+       cgit_vprint_error(fmt, ap);
+       va_end(ap);

        cgit_print_docend();
 }
 
        cgit_print_docend();
 }
 


@@ -175,8 +182,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
 
        f = get_format(filename);
        if (!f) {
 
        f = get_format(filename);
        if (!f) {

-               show_error(xstrdup(fmt("Unsupported snapshot format: %s",
-                                      filename)));
+               show_error("Unsupported snapshot format: %s", filename);

                return;
        }
 
                return;
        }