summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-05-29 11:17:56 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-05-29 21:53:37 +1000
commit712ac1efb687a945a89db6aa3e998c1a17b38653 (patch)
tree763dbf0dcc09f1137ab4bf0ed83aa921f54b5579 /misc.h
parent837ffa9699a9cba47ae7921d2876afaccc027133 (diff)
upstream: Make dollar_expand variadic and pass a real va_list to
vdollar_percent_expand. Fixes build error on arm64 spotted by otto@. OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279
Diffstat (limited to 'misc.h')
-rw-r--r--misc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc.h b/misc.h
index 7e9f5ac19..ab94a79c0 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.86 2020/05/29 04:25:40 dtucker Exp $ */ 1/* $OpenBSD: misc.h,v 1.87 2020/05/29 11:17:56 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -69,7 +69,7 @@ long convtime(const char *);
69const char *fmt_timeframe(time_t t); 69const char *fmt_timeframe(time_t t);
70char *tilde_expand_filename(const char *, uid_t); 70char *tilde_expand_filename(const char *, uid_t);
71 71
72char *dollar_expand(int *, const char *string); 72char *dollar_expand(int *, const char *string, ...);
73char *percent_expand(const char *, ...) __attribute__((__sentinel__)); 73char *percent_expand(const char *, ...) __attribute__((__sentinel__));
74char *percent_dollar_expand(const char *, ...) __attribute__((__sentinel__)); 74char *percent_dollar_expand(const char *, ...) __attribute__((__sentinel__));
75char *tohex(const void *, size_t); 75char *tohex(const void *, size_t);