Deleted Added
full compact
mbstowcs.c (129179) mbstowcs.c (132497)
1/*-
2 * Copyright (c) 2002-2004 Tim J. Robbins.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002-2004 Tim J. Robbins.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/lib/libc/locale/mbstowcs.c 129179 2004-05-13 11:20:27Z tjr $");
28__FBSDID("$FreeBSD: head/lib/libc/locale/mbstowcs.c 132497 2004-07-21 10:54:57Z tjr $");
29
29
30#include <limits.h>
30#include <stdlib.h>
31#include <wchar.h>
32#include "mblocal.h"
33
34size_t
35mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
36{
37 static const mbstate_t initial;
38 mbstate_t mbs;
39
40 mbs = initial;
31#include <stdlib.h>
32#include <wchar.h>
33#include "mblocal.h"
34
35size_t
36mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
37{
38 static const mbstate_t initial;
39 mbstate_t mbs;
40
41 mbs = initial;
41 return (__mbsrtowcs(pwcs, &s, n, &mbs));
42 return (__mbsnrtowcs(pwcs, &s, SIZE_T_MAX, n, &mbs));
42}
43}