diff options
author | John Keeping <john@keeping.me.uk> | 2013-04-06 12:23:52 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-04-08 16:11:29 +0200 |
commit | ed5bd30ebe6921dd22948a3f33a314283f043606 (patch) | |
tree | 494f1ac8aae7c2147146fefc9aebcdb1bfa671c0 /ui-snapshot.c | |
parent | d2e20e38141c882e46eaa77f172fc2ae37a19d3b (diff) | |
download | cgit-ed5bd30ebe6921dd22948a3f33a314283f043606.tar.gz cgit-ed5bd30ebe6921dd22948a3f33a314283f043606.tar.xz |
Convert cgit_print_error to a variadic function
This removes many uses of "fmt" which uses a fixed size static pool of
fixed size buffers. Instead of relying on these, we now pass around
argument lists for as long as possible before using a strbuf to render
content of an arbitrary size.
Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r-- | ui-snapshot.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 9be5dbe..a47884e 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -100,11 +100,11 @@ static int make_snapshot(const struct cgit_snapshot_format *format, 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)) { - 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); @@ -154,13 +154,18 @@ static const char *get_ref_from_filename(const char *url, const char *filename, return NULL; } -static 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); - cgit_print_error(msg); + va_start(ap, fmt); + cgit_vprint_error(fmt, ap); + va_end(ap); cgit_print_docend(); } @@ -177,8 +182,7 @@ void cgit_print_snapshot(const char *head, const char *hex, f = get_format(filename); if (!f) { - show_error(xstrdup(fmt("Unsupported snapshot format: %s", - filename))); + show_error("Unsupported snapshot format: %s", filename); return; } |