summaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-07 01:14:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-07 01:14:47 (GMT)
commit6ba649e4085bd7b8c80fd2080ca003bf450c9f53 (patch)
treeae506d2c343a66ce4192d4587219acd59006e797 /strbuf.h
parenteb37527ab0b6e9ff1cbd01aa20a4dd6aa4150a96 (diff)
parent3b702239d6399685aa69539b83be5f744cfa10e3 (diff)
downloadgit-6ba649e4085bd7b8c80fd2080ca003bf450c9f53.zip
git-6ba649e4085bd7b8c80fd2080ca003bf450c9f53.tar.gz
git-6ba649e4085bd7b8c80fd2080ca003bf450c9f53.tar.bz2
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
Diffstat (limited to 'strbuf.h')
-rw-r--r--strbuf.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/strbuf.h b/strbuf.h
index 3646a62..2075384 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -334,14 +334,15 @@ extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
/**
* Add the time specified by `tm`, as formatted by `strftime`.
- * `tz_name` is used to expand %Z internally unless it's NULL.
* `tz_offset` is in decimal hhmm format, e.g. -600 means six hours west
* of Greenwich, and it's used to expand %z internally. However, tokens
* with modifiers (e.g. %Ez) are passed to `strftime`.
+ * `suppress_tz_name`, when set, expands %Z internally to the empty
+ * string rather than passing it to `strftime`.
*/
extern void strbuf_addftime(struct strbuf *sb, const char *fmt,
const struct tm *tm, int tz_offset,
- const char *tz_name);
+ int suppress_tz_name);
/**
* Read a given size of data from a FILE* pointer to the buffer.