Deleted Added
sdiff udiff text old ( 225736 ) new ( 235785 )
full compact
wcstoul.c (225736) wcstoul.c (235785)
1/*
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
1/*
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Copyright (c) 2011 The FreeBSD Foundation
6 * All rights reserved.
7 * Portions of this software were developed by David Chisnall
8 * under sponsorship from the FreeBSD Foundation.
9 *
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions
12 * are met:
13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution.

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

28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 */
34
35#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: stable/9/lib/libc/locale/wcstoul.c 165903 2007-01-09 00:28:16Z imp $");
36__FBSDID("$FreeBSD: stable/9/lib/libc/locale/wcstoul.c 235785 2012-05-22 14:40:39Z theraven $");
32
33#include <ctype.h>
34#include <errno.h>
35#include <limits.h>
36#include <wchar.h>
37#include <wctype.h>
37
38#include <ctype.h>
39#include <errno.h>
40#include <limits.h>
41#include <wchar.h>
42#include <wctype.h>
43#include "xlocale_private.h"
38
39/*
40 * Convert a wide character string to an unsigned long integer.
41 */
42unsigned long
44
45/*
46 * Convert a wide character string to an unsigned long integer.
47 */
48unsigned long
43wcstoul(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
49wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
50 int base, locale_t locale)
44{
45 const wchar_t *s;
46 unsigned long acc;
47 wchar_t c;
48 unsigned long cutoff;
49 int neg, any, cutlim;
51{
52 const wchar_t *s;
53 unsigned long acc;
54 wchar_t c;
55 unsigned long cutoff;
56 int neg, any, cutlim;
57 FIX_LOCALE(locale);
50
51 /*
52 * See strtol for comments as to the logic used.
53 */
54 s = nptr;
55 do {
56 c = *s++;
58
59 /*
60 * See strtol for comments as to the logic used.
61 */
62 s = nptr;
63 do {
64 c = *s++;
57 } while (iswspace(c));
65 } while (iswspace_l(c, locale));
58 if (c == L'-') {
59 neg = 1;
60 c = *s++;
61 } else {
62 neg = 0;
63 if (c == L'+')
64 c = *s++;
65 }

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

74 acc = any = 0;
75 if (base < 2 || base > 36)
76 goto noconv;
77
78 cutoff = ULONG_MAX / base;
79 cutlim = ULONG_MAX % base;
80 for ( ; ; c = *s++) {
81#ifdef notyet
66 if (c == L'-') {
67 neg = 1;
68 c = *s++;
69 } else {
70 neg = 0;
71 if (c == L'+')
72 c = *s++;
73 }

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

82 acc = any = 0;
83 if (base < 2 || base > 36)
84 goto noconv;
85
86 cutoff = ULONG_MAX / base;
87 cutlim = ULONG_MAX % base;
88 for ( ; ; c = *s++) {
89#ifdef notyet
82 if (iswdigit(c))
83 c = digittoint(c);
90 if (iswdigit_l(c, locale))
91 c = digittoint_l(c, locale);
84 else
85#endif
86 if (c >= L'0' && c <= L'9')
87 c -= L'0';
88 else if (c >= L'A' && c <= L'Z')
89 c -= L'A' - 10;
90 else if (c >= L'a' && c <= L'z')
91 c -= L'a' - 10;

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

108noconv:
109 errno = EINVAL;
110 } else if (neg)
111 acc = -acc;
112 if (endptr != NULL)
113 *endptr = (wchar_t *)(any ? s - 1 : nptr);
114 return (acc);
115}
92 else
93#endif
94 if (c >= L'0' && c <= L'9')
95 c -= L'0';
96 else if (c >= L'A' && c <= L'Z')
97 c -= L'A' - 10;
98 else if (c >= L'a' && c <= L'z')
99 c -= L'a' - 10;

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

116noconv:
117 errno = EINVAL;
118 } else if (neg)
119 acc = -acc;
120 if (endptr != NULL)
121 *endptr = (wchar_t *)(any ? s - 1 : nptr);
122 return (acc);
123}
124unsigned long
125wcstoul(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
126{
127 return wcstoul_l(nptr, endptr, base, __get_locale());
128}