summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-07-01 13:15:47 +0000
committerJunio C Hamano <gitster@pobox.com>2017-07-01 10:47:05 -0700
commit3b702239d6399685aa69539b83be5f744cfa10e3 (patch)
tree4a2938057646a3f1f65ad9cd8c40ca575b6dbbff /strbuf.c
parent4904cbc9e195f1de2cb6ff3c5b3d5b756343ef44 (diff)
downloadgit-3b702239d6399685aa69539b83be5f744cfa10e3.tar.gz
strbuf: change an always NULL/"" strbuf_addftime() param to boolab/strbuf-addftime-tzname-boolify
strbuf_addftime() allows callers to pass a time zone name for expanding %Z. The only current caller either passes the empty string or NULL, in which case %Z is handed over verbatim to strftime(3). Replace that string parameter with a flag controlling whether to remove %Z from the format specification. This simplifies the code. Commit-message-by: René Scharfe <l.s.r@web.de> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/strbuf.c b/strbuf.c
index be3b9e37b1..89e40bb496 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -786,7 +786,7 @@ char *xstrfmt(const char *fmt, ...)
}
void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
- int tz_offset, const char *tz_name)
+ int tz_offset, int suppress_tz_name)
{
struct strbuf munged_fmt = STRBUF_INIT;
size_t hint = 128;
@@ -815,8 +815,7 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
fmt++;
break;
case 'Z':
- if (tz_name) {
- strbuf_addstr(&munged_fmt, tz_name);
+ if (suppress_tz_name) {
fmt++;
break;
}