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 <[email protected]>
---
Changes since v1:
- Fix a thinko: 'fmt("%s", path)' is equivalent to path not "%s".

 scan-tree.c | 4 ++--
 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)
                return;
 
        if (base == path)
-               rel = xstrdup(fmt("%s", path));
+               rel = xstrdup(path);
        else
-               rel = xstrdup(fmt("%s", path + strlen(base) + 1));
+               rel = xstrdup(path + strlen(base) + 1);
 
        if (!strcmp(rel + strlen(rel) - 5, "/.git"))
                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)
                else
                        ctx.page.mimetype = "text/plain";
        }
-       ctx.page.filename = fmt("%s", path);
+       ctx.page.filename = path;
        ctx.page.size = size;
        ctx.page.etag = sha1_to_hex(sha1);
        cgit_print_http_headers(&ctx);
-- 
1.8.2.692.g17a9715


_______________________________________________
cgit mailing list
[email protected]
http://hjemli.net/mailman/listinfo/cgit

Reply via email to