RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

deraadt

OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5
This commit is contained in:
djm@openbsd.org 2020-05-01 06:28:52 +00:00 committed by Damien Miller
parent 99ce9cefbe
commit 31909696c4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utf8.c
View File

@ -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> * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
* *
@ -43,7 +43,6 @@
static int dangerous_locale(void); static int dangerous_locale(void);
static int grow_dst(char **, size_t *, size_t, char **, size_t); 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. * written is returned in *wp.
*/ */
static int int
vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap) vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap)
{ {
char *src; /* Source string returned from vasprintf. */ char *src; /* Source string returned from vasprintf. */

3
utf8.h
View File

@ -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> * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
* *
@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 *, ...) int mprintf(const char *, ...)
__attribute__((format(printf, 1, 2))); __attribute__((format(printf, 1, 2)));
int fmprintf(FILE *, const char *, ...) int fmprintf(FILE *, const char *, ...)