strbuf: change an always NULL/"" strbuf_addftime() param to bool
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>
This commit is contained in:
committed by
Junio C Hamano
parent
4904cbc9e1
commit
3b702239d6
5
strbuf.c
5
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user