path: root/strbuf.h
diff options
authorÆvar Arnfjörð Bjarmason <>2017-07-01 13:15:47 (GMT)
committerJunio C Hamano <>2017-07-01 17:47:05 (GMT)
commit3b702239d6399685aa69539b83be5f744cfa10e3 (patch)
tree4a2938057646a3f1f65ad9cd8c40ca575b6dbbff /strbuf.h
parent4904cbc9e195f1de2cb6ff3c5b3d5b756343ef44 (diff)
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 <> Signed-off-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'strbuf.h')
1 files changed, 3 insertions, 2 deletions
diff --git a/strbuf.h b/strbuf.h
index 6708cef..9262615 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -343,11 +343,12 @@ extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
* `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`.
- * `tz_name` is used to expand %Z internally unless it's NULL.
+ * `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.