From b5f0a0cb021e6e5d31c71a412ac21c286c9b42ee Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 1 May 2020 06:28:53 +0000 Subject: expose vasnmprintf(); ok (as part of other commit) markus deraadt --- usr.bin/ssh/utf8.c | 5 ++--- usr.bin/ssh/utf8.h | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.bin/ssh') diff --git a/usr.bin/ssh/utf8.c b/usr.bin/ssh/utf8.c index 6ff61ac7d3e..cdfb8d1be6b 100644 --- a/usr.bin/ssh/utf8.c +++ b/usr.bin/ssh/utf8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utf8.c,v 1.10 2020/04/03 02:25:21 djm Exp $ */ +/* $OpenBSD: utf8.c,v 1.11 2020/05/01 06:28:52 djm Exp $ */ /* * Copyright (c) 2016 Ingo Schwarze * @@ -34,7 +34,6 @@ static int dangerous_locale(void); static int grow_dst(char **, size_t *, size_t, char **, size_t); -static int vasnmprintf(char **, size_t, int *, const char *, va_list); /* @@ -92,7 +91,7 @@ grow_dst(char **dst, size_t *sz, size_t maxsz, char **dp, size_t need) * written is returned in *wp. */ -static int +int vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap) { char *src; /* Source string returned from vasprintf. */ diff --git a/usr.bin/ssh/utf8.h b/usr.bin/ssh/utf8.h index 05c41f9e0f1..5e26519b0ce 100644 --- a/usr.bin/ssh/utf8.h +++ b/usr.bin/ssh/utf8.h @@ -1,4 +1,4 @@ -/* $OpenBSD: utf8.h,v 1.2 2020/04/03 02:25:21 djm Exp $ */ +/* $OpenBSD: utf8.h,v 1.3 2020/05/01 06:28:52 djm Exp $ */ /* * Copyright (c) 2016 Ingo Schwarze * @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int vasnmprintf(char **, size_t, int *, const char *, va_list); int mprintf(const char *, ...) __attribute__((format(printf, 1, 2))); int fmprintf(FILE *, const char *, ...) -- cgit v1.2.3