From: john at keeping.me.uk (John Keeping)
Subject: [PATCH v2 17/22] ui-summary.c: use struct strbuf instead of fixed-size buffers
Date: Sun, 7 Apr 2013 15:26:46 +0100 [thread overview]
Message-ID: <f206035b0f9e1da63dc3f77706c50767d0ed3480.1365344206.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1365344206.git.john@keeping.me.uk>
Signed-off-by: John Keeping <john at keeping.me.uk>
---
Changes since v1:
- Use fmtalloc where appropriate
ui-summary.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/ui-summary.c b/ui-summary.c
index bd123ef..f965b32 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -17,6 +17,7 @@
static void print_url(char *base, char *suffix)
{
int columns = 3;
+ struct strbuf basebuf = STRBUF_INIT;
if (ctx.repo->enable_log_filecount)
columns++;
@@ -25,13 +26,16 @@ static void print_url(char *base, char *suffix)
if (!base || !*base)
return;
- if (suffix && *suffix)
- base = fmt("%s/%s", base, suffix);
+ if (suffix && *suffix) {
+ strbuf_addf(&basebuf, "%s/%s", base, suffix);
+ base = basebuf.buf;
+ }
htmlf("<tr><td colspan='%d'><a href='", columns);
html_url_path(base);
html("'>");
html_txt(base);
html("</a></td></tr>\n");
+ strbuf_release(&basebuf);
}
static void print_urls(char *txt, char *suffix)
@@ -112,8 +116,8 @@ void cgit_print_repo_readme(char *path)
/* Prepend repo path to relative readme path unless tracked. */
if (!ref && *ctx.repo->readme != '/')
- ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
- ctx.repo->readme));
+ ctx.repo->readme = fmtalloc("%s/%s", ctx.repo->path,
+ ctx.repo->readme);
/* If a subpath is specified for the about page, make it relative
* to the directory containing the configured readme.
--
1.8.2.692.g17a9715
next prev parent reply other threads:[~2013-04-07 14:26 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-07 9:29 [PATCH 00/19] Fixed-size buffer removal john
2013-04-07 9:29 ` [PATCH 01/19] Fix out-of-bounds memory accesses with virtual_root="" john
2013-04-07 9:29 ` [PATCH 02/19] Remove redundant calls to fmt("%s", ...) john
2013-04-07 11:05 ` Jason
2013-04-07 11:25 ` john
2013-04-07 11:30 ` Jason
2013-04-07 9:29 ` [PATCH 03/19] cache.c: don't use statically sized buffers for filenames john
2013-04-07 11:11 ` Jason
2013-04-07 11:30 ` john
2013-04-07 9:29 ` [PATCH 04/19] html: introduce html_txtf and html_vtxtf functions john
2013-04-07 9:29 ` [PATCH 05/19] Convert cgit_print_error to a variadic function john
2013-04-07 9:29 ` [PATCH 06/19] scan-tree: use struct strbuf instead of static buffers john
2013-04-07 11:29 ` Jason
2013-04-07 11:33 ` john
2013-04-07 9:29 ` [PATCH 07/19] ui-log.c: use a strbuf for refs john
2013-04-07 9:29 ` [PATCH 08/19] ui-log.c: use a strbuf for grep arguments john
2013-04-07 9:30 ` [PATCH 09/19] ui-plain.c: use struct strbuf instead of fmt() john
2013-04-07 9:30 ` [PATCH 10/19] ui-refs.c: use struct strbuf instead of fixed-size buffers john
2013-04-07 13:08 ` Jason
2013-04-07 9:30 ` [PATCH 11/19] ui-repolist.c: use struct strbuf for repository paths john
2013-04-07 9:30 ` [PATCH 12/19] ui-snapshot.c: tidy up memory management in write_archive_type john
2013-04-07 9:30 ` [PATCH 13/19] ui-snapshot: use a struct strbuf instead of fixed-size buffers john
2013-04-07 13:25 ` Jason
2013-04-07 13:37 ` john
2013-04-07 13:39 ` Jason
2013-04-07 13:33 ` Jason
2013-04-07 9:30 ` [PATCH 14/19] ui-summary.c: use " john
2013-04-07 12:20 ` Jason
2013-04-07 12:36 ` john
2013-04-07 12:41 ` Jason
2013-04-07 12:43 ` Jason
2013-04-07 9:30 ` [PATCH 15/19] ui-tag.c: use struct strbuf for user-supplied data john
2013-04-07 9:30 ` [PATCH 16/19] ui-tree.c: use struct strbuf instead of fmt() john
2013-04-07 9:30 ` [PATCH 17/19] cgit.c: " john
2013-04-07 9:30 ` [PATCH 18/19] html: add html_attrf to output an attribute value from a format string john
2013-04-07 9:30 ` [PATCH 19/19] ui-shared.c: use struct strbuf instead of fmt() john
2013-04-07 12:37 ` Jason
2013-04-07 12:44 ` john
2013-04-07 12:49 ` cgit
2013-04-07 13:08 ` [PATCH 00/19] Fixed-size buffer removal Jason
2013-04-07 13:14 ` john
2013-04-08 15:31 ` Jason
2013-04-08 17:38 ` john
2013-04-08 18:28 ` Jason
2013-04-07 14:26 ` [PATCH v2 00/22] " john
2013-04-07 14:26 ` [PATCH v2 01/22] Fix out-of-bounds memory accesses with virtual_root="" john
2013-04-07 14:26 ` [PATCH v2 02/22] Mark char* fields in struct cgit_page as const john
2013-04-07 14:26 ` [PATCH v2 03/22] Remove redundant calls to fmt("%s", ...) john
2013-04-07 14:26 ` [PATCH v2 04/22] html.c: add fmtalloc helper john
2013-04-07 14:26 ` [PATCH v2 05/22] shared.c: add strbuf_ensure_end john
2013-04-07 14:26 ` [PATCH v2 06/22] cache.c: don't use statically sized buffers for filenames john
2013-04-07 14:26 ` [PATCH v2 07/22] html: introduce html_txtf and html_vtxtf functions john
2013-04-07 14:26 ` [PATCH v2 08/22] Convert cgit_print_error to a variadic function john
2013-04-07 15:01 ` [PATCH 08/22 v3] " john
2013-04-07 14:26 ` [PATCH v2 09/22] scan-tree: use struct strbuf instead of static buffers john
2013-04-07 14:26 ` [PATCH v2 10/22] ui-log.c: use a strbuf for refs john
2013-04-07 14:26 ` [PATCH v2 11/22] ui-log.c: use a strbuf for grep arguments john
2013-04-07 14:26 ` [PATCH v2 12/22] ui-plain.c: use struct strbuf instead of fmt() john
2013-04-07 14:26 ` [PATCH v2 13/22] ui-refs.c: use struct strbuf instead of fixed-size buffers john
2013-04-07 14:26 ` [PATCH v2 14/22] ui-repolist.c: use struct strbuf for repository paths john
2013-04-07 14:26 ` [PATCH v2 15/22] ui-snapshot.c: tidy up memory management in write_archive_type john
2013-04-07 14:26 ` [PATCH v2 16/22] ui-snapshot: use a struct strbuf instead of fixed-size buffers john
2013-04-07 14:26 ` john [this message]
2013-04-07 14:26 ` [PATCH v2 18/22] ui-tag.c: use struct strbuf for user-supplied data john
2013-04-07 14:26 ` [PATCH v2 19/22] ui-tree.c: use struct strbuf instead of fmt() john
2013-04-07 14:26 ` [PATCH v2 20/22] cgit.c: " john
2013-04-07 14:26 ` [PATCH v2 21/22] html: add html_attrf to output an attribute value from a format string john
2013-04-07 14:26 ` [PATCH v2 22/22] ui-shared.c: use struct strbuf instead of fmt() john
2013-04-07 15:21 ` Jason
2013-04-07 15:43 ` john
2013-04-07 15:46 ` Jason
2013-04-08 10:22 ` cgit
2013-04-08 14:04 ` Jason
2013-04-08 17:40 ` john
2013-04-08 14:23 ` [PATCH 00/19] Fixed-size buffer removal Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f206035b0f9e1da63dc3f77706c50767d0ed3480.1365344206.git.john@keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).