From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 11/19] ui-repolist.c: use struct strbuf for repository paths
Date: Sun, 7 Apr 2013 10:30:02 +0100 [thread overview]
Message-ID: <9a462a79c547ebafe5c6e3f71aa7747d2ac4eea6.1365326321.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1365326321.git.john@keeping.me.uk>
Signed-off-by: John Keeping <john at keeping.me.uk>
---
ui-repolist.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/ui-repolist.c b/ui-repolist.c
index 76fe71a..47ca997 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -33,7 +33,7 @@ static time_t read_agefile(char *path)
static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
{
- char *path;
+ struct strbuf path = STRBUF_INIT;
struct stat s;
struct cgit_repo *r = (struct cgit_repo *)repo;
@@ -41,32 +41,36 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
*mtime = repo->mtime;
return 1;
}
- path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
- if (stat(path, &s) == 0) {
- *mtime = read_agefile(path);
+ strbuf_addf(&path, "%s/%s", repo->path, ctx.cfg.agefile);
+ if (stat(path.buf, &s) == 0) {
+ *mtime = read_agefile(path.buf);
if (*mtime) {
r->mtime = *mtime;
- return 1;
+ goto end;
}
}
- path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
- repo->defbranch : "master");
- if (stat(path, &s) == 0) {
+ strbuf_reset(&path);
+ strbuf_addf(&path, "%s/refs/heads/%s", repo->path,
+ repo->defbranch ? repo->defbranch : "master");
+ if (stat(path.buf, &s) == 0) {
*mtime = s.st_mtime;
r->mtime = *mtime;
- return 1;
+ goto end;
}
- path = fmt("%s/%s", repo->path, "packed-refs");
- if (stat(path, &s) == 0) {
+ strbuf_reset(&path);
+ strbuf_addf(&path, "%s/%s", repo->path, "packed-refs");
+ if (stat(path.buf, &s) == 0) {
*mtime = s.st_mtime;
r->mtime = *mtime;
- return 1;
+ goto end;
}
*mtime = 0;
r->mtime = *mtime;
+end:
+ strbuf_release(&path);
return (r->mtime != 0);
}
--
1.8.2.692.g17a9715
next prev parent reply other threads:[~2013-04-07 9:30 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 ` john [this message]
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 ` [PATCH v2 17/22] ui-summary.c: use " john
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=9a462a79c547ebafe5c6e3f71aa7747d2ac4eea6.1365326321.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).