Print this page
Thread safety fixes.
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libc/port/locale/lnumeric.c
+++ new/usr/src/lib/libc/port/locale/lnumeric.c
1 1 /*
2 2 * Copyright 2014 Garrett D'Amore.
3 3 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
4 4 * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
5 5 * All rights reserved.
6 6 *
7 7 * Redistribution and use in source and binary forms, with or without
8 8 * modification, are permitted provided that the following conditions
9 9 * are met:
10 10 * 1. Redistributions of source code must retain the above copyright
11 11 * notice, this list of conditions and the following disclaimer.
12 12 * 2. Redistributions in binary form must reproduce the above copyright
13 13 * notice, this list of conditions and the following disclaimer in the
14 14 * documentation and/or other materials provided with the distribution.
15 15 *
16 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
17 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 26 * SUCH DAMAGE.
27 27 */
28 28
29 29 #include "lint.h"
30 30 #include <limits.h>
31 31 #include <errno.h>
32 32 #include "ldpart.h"
33 33 #include "lnumeric.h"
34 34 #include "localeimpl.h"
35 35
36 36 extern const char *__fix_locale_grouping_str(const char *);
37 37
38 38 #define LCNUMERIC_SIZE (sizeof (struct lc_numeric) / sizeof (char *))
39 39
↓ open down ↓ |
39 lines elided |
↑ open up ↑ |
40 40 static char numempty[] = { CHAR_MAX, '\0' };
41 41
42 42 struct lc_numeric lc_numeric_posix = {
43 43 ".", /* decimal_point */
44 44 "", /* thousands_sep */
45 45 numempty /* grouping */
46 46 };
47 47
48 48 struct locdata __posix_numeric_locdata = {
49 49 .l_lname = "C",
50 - .l_refcnt = (uint32_t)-1,
51 50 .l_data = { &lc_numeric_posix }
52 51 };
53 52
54 53
55 54 /*
56 - * Return the locale's numeric locdata structure, places a hold on it,
57 - * which the caller must release.
55 + * Return the locale's numeric locdata structure.
58 56 */
59 57 struct locdata *
60 58 __lc_numeric_load(const char *name)
61 59 {
62 60 struct locdata *ldata;
63 61 struct lc_numeric *lnum;
64 62 int ret;
65 63
66 64 if ((ldata = __locdata_alloc(name, sizeof (*lnum))) == NULL) {
67 65 errno = EINVAL;
68 66 return (NULL);
69 67 }
70 68 lnum = ldata->l_data[0];
71 69
72 70 ret = __part_load_locale(name, (char **)&ldata->l_data[1],
73 71 "LC_NUMERIC", LCNUMERIC_SIZE, LCNUMERIC_SIZE, (const char **)lnum);
74 72
75 73 if (ret != _LDP_LOADED) {
76 - __locdata_release(ldata);
74 + __locdata_free(ldata);
77 75 return (NULL);
78 76 }
79 77
80 78 /* Can't be empty according to C99 */
81 79 if (*lnum->decimal_point == '\0')
82 80 lnum->decimal_point = lc_numeric_posix.decimal_point;
83 81 lnum->grouping = __fix_locale_grouping_str(lnum->grouping);
84 82
85 83 return (ldata);
86 84 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX