upstream: expose vasnmprintf(); ok (as part of other commit) markus

deraadt

OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5

diff --git a/utf8.c b/utf8.c
index f83401996b7e0bdb8c794d341f298430af65795a..7f63b25aeefccb30d051722e4892eb3a95720108 100644 (file)
--- a/utf8.c
+++ b/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 <schwarze@openbsd.org>
  *
@@ -43,7 +43,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);
 
 
 /*
@@ -101,7 +100,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/utf8.h b/utf8.h
index 20a11dc59d8fc2ebd473bcfcc77daa5db6866223..9d6d9a32cd8ade9e86004d90fffce65572a5d014 100644 (file)
--- a/utf8.h
+++ b/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 <schwarze@openbsd.org>
  *
@@ -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 *, ...)