summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--utf8.c5
-rw-r--r--utf8.h3
2 files changed, 4 insertions, 4 deletions
diff --git a/utf8.c b/utf8.c
index f83401996..7f63b25ae 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: utf8.c,v 1.10 2020/04/03 02:25:21 djm Exp $ */ 1/* $OpenBSD: utf8.c,v 1.11 2020/05/01 06:28:52 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3 * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4 * 4 *
@@ -43,7 +43,6 @@
43 43
44static int dangerous_locale(void); 44static int dangerous_locale(void);
45static int grow_dst(char **, size_t *, size_t, char **, size_t); 45static int grow_dst(char **, size_t *, size_t, char **, size_t);
46static int vasnmprintf(char **, size_t, int *, const char *, va_list);
47 46
48 47
49/* 48/*
@@ -101,7 +100,7 @@ grow_dst(char **dst, size_t *sz, size_t maxsz, char **dp, size_t need)
101 * written is returned in *wp. 100 * written is returned in *wp.
102 */ 101 */
103 102
104static int 103int
105vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap) 104vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap)
106{ 105{
107 char *src; /* Source string returned from vasprintf. */ 106 char *src; /* Source string returned from vasprintf. */
diff --git a/utf8.h b/utf8.h
index 20a11dc59..9d6d9a32c 100644
--- a/utf8.h
+++ b/utf8.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: utf8.h,v 1.2 2020/04/03 02:25:21 djm Exp $ */ 1/* $OpenBSD: utf8.h,v 1.3 2020/05/01 06:28:52 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3 * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4 * 4 *
@@ -15,6 +15,7 @@
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */ 16 */
17 17
18int vasnmprintf(char **, size_t, int *, const char *, va_list);
18int mprintf(const char *, ...) 19int mprintf(const char *, ...)
19 __attribute__((format(printf, 1, 2))); 20 __attribute__((format(printf, 1, 2)));
20int fmprintf(FILE *, const char *, ...) 21int fmprintf(FILE *, const char *, ...)