Merge branch 'ab/strbuf-addftime-tzname-boolify'
strbuf_addftime() is further getting tweaked. * ab/strbuf-addftime-tzname-boolify: strbuf: change an always NULL/"" strbuf_addftime() param to bool strbuf.h comment: discuss strbuf_addftime() arguments in order
This commit is contained in:
5
strbuf.c
5
strbuf.c
@ -779,7 +779,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;
|
||||
@ -808,8 +808,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