Deleted Added
sdiff udiff text old ( 178287 ) new ( 205021 )
full compact
vswprintf.c (178287) vswprintf.c (205021)
1/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
2
3/*
4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 17 unchanged lines hidden (view full) ---

26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31#if 0
32__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
33#endif
1/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
2
3/*
4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 17 unchanged lines hidden (view full) ---

26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31#if 0
32__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
33#endif
34__FBSDID("$FreeBSD: head/lib/libc/stdio/vswprintf.c 178287 2008-04-17 22:17:54Z jhb $");
34__FBSDID("$FreeBSD: head/lib/libc/stdio/vswprintf.c 205021 2010-03-11 17:03:32Z jhb $");
35
36#include <errno.h>
37#include <stdio.h>
38#include <stdlib.h>
39#include <wchar.h>
40#include "local.h"
41
42int
43vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
44 __va_list ap)
45{
46 static const mbstate_t initial;
47 mbstate_t mbs;
35
36#include <errno.h>
37#include <stdio.h>
38#include <stdlib.h>
39#include <wchar.h>
40#include "local.h"
41
42int
43vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
44 __va_list ap)
45{
46 static const mbstate_t initial;
47 mbstate_t mbs;
48 FILE f;
48 FILE f = FAKE_FILE;
49 char *mbp;
50 int ret, sverrno;
51 size_t nwc;
52
53 if (n == 0) {
54 errno = EINVAL;
55 return (-1);
56 }
57
49 char *mbp;
50 int ret, sverrno;
51 size_t nwc;
52
53 if (n == 0) {
54 errno = EINVAL;
55 return (-1);
56 }
57
58 f._file = -1;
59 f._flags = __SWR | __SSTR | __SALC;
60 f._bf._base = f._p = (unsigned char *)malloc(128);
61 if (f._bf._base == NULL) {
62 errno = ENOMEM;
63 return (-1);
64 }
65 f._bf._size = f._w = 127; /* Leave room for the NUL */
58 f._flags = __SWR | __SSTR | __SALC;
59 f._bf._base = f._p = (unsigned char *)malloc(128);
60 if (f._bf._base == NULL) {
61 errno = ENOMEM;
62 return (-1);
63 }
64 f._bf._size = f._w = 127; /* Leave room for the NUL */
66 f._orientation = 0;
67 memset(&f._mbstate, 0, sizeof(mbstate_t));
68 ret = __vfwprintf(&f, fmt, ap);
69 if (ret < 0) {
70 sverrno = errno;
71 free(f._bf._base);
72 errno = sverrno;
73 return (-1);
74 }
75 *f._p = '\0';

--- 20 unchanged lines hidden --- 		65 ret = __vfwprintf(&f, fmt, ap);
66 if (ret < 0) {
67 sverrno = errno;
68 free(f._bf._base);
69 errno = sverrno;
70 return (-1);
71 }
72 *f._p = '\0';

--- 20 unchanged lines hidden ---