diff options
author | John Keeping | 2013-04-06 10:49:22 +0100 |
---|---|---|
committer | Jason A. Donenfeld | 2013-04-08 16:11:29 +0200 |
commit | 42d5476f258e7909682f1b611da00d64507d45c6 (patch) | |
tree | 38d67ace7e30cbb2aacc1f000df348654601539e | |
parent | Convert cgit_print_error to a variadic function (diff) | |
download | cgit-42d5476f258e7909682f1b611da00d64507d45c6.tar.gz cgit-42d5476f258e7909682f1b611da00d64507d45c6.zip |
Remove redundant calls to fmt("%s", ...)
After this change there is one remaining call 'fmt("%s", delim)' in ui-shared.c but is needed as delim is stack allocated and so cannot be returned from the function. Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r-- | scan-tree.c | 4 | ||||
-rw-r--r-- | ui-plain.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scan-tree.c b/scan-tree.c index 0d3e0ad..05caba5 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -96,9 +96,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
96 | return; | 96 | return; |
97 | 97 | ||
98 | if (base == path) | 98 | if (base == path) |
99 | rel = xstrdup(fmt("%s", path)); | 99 | rel = xstrdup(path); |
100 | else | 100 | else |
101 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); | 101 | rel = xstrdup(path + strlen(base) + 1); |
102 | 102 | ||
103 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) | 103 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
104 | rel[strlen(rel) - 5] = '\0'; | 104 | rel[strlen(rel) - 5] = '\0'; |
diff --git a/ui-plain.c b/ui-plain.c index 482d53a..6b0d84b 100644 --- a/ui-plain.c +++ b/ui-plain.c | |||
@@ -95,7 +95,7 @@ static int print_object(const unsigned char *sha1, const char *path) | |||
95 | else | 95 | else |
96 | ctx.page.mimetype = "text/plain"; | 96 | ctx.page.mimetype = "text/plain"; |
97 | } | 97 | } |
98 | ctx.page.filename = fmt("%s", path); | 98 | ctx.page.filename = path; |
99 | ctx.page.size = size; | 99 | ctx.page.size = size; |
100 | ctx.page.etag = sha1_to_hex(sha1); | 100 | ctx.page.etag = sha1_to_hex(sha1); |
101 | cgit_print_http_headers(&ctx); | 101 | cgit_print_http_headers(&ctx); |