Print this page
Thread safety fixes.
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libc/port/locale/lmessages.c
+++ new/usr/src/lib/libc/port/locale/lmessages.c
1 1 /*
2 2 * Copyright 2014 Garrett D'Amore <garrett@damore.org>
3 3 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
4 4 * Copyright (c) 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 <stddef.h>
31 31 #include <errno.h>
32 32 #include "ldpart.h"
33 33 #include "lmessages.h"
34 34 #include "localeimpl.h"
35 35
36 36 #define LCMESSAGES_SIZE_FULL (sizeof (struct lc_messages) / sizeof (char *))
37 37 #define LCMESSAGES_SIZE_MIN \
38 38 (offsetof(struct lc_messages, yesstr) / sizeof (char *))
39 39
40 40 static char empty[] = "";
↓ open down ↓ |
40 lines elided |
↑ open up ↑ |
41 41
42 42 struct lc_messages lc_messages_posix = {
43 43 "^[yY]", /* yesexpr */
44 44 "^[nN]", /* noexpr */
45 45 "yes", /* yesstr */
46 46 "no" /* nostr */
47 47 };
48 48
49 49 struct locdata __posix_messages_locdata = {
50 50 .l_lname = "C",
51 - .l_refcnt = (uint32_t)-1,
52 51 .l_data = { &lc_messages_posix }
53 52 };
54 53
55 54 struct locdata *
56 55 __lc_messages_load(const char *name)
57 56 {
58 57 struct locdata *ldata;
59 58 struct lc_messages *lmsgs;
60 59 int ret;
61 60
62 61 if ((ldata = __locdata_alloc(name, sizeof (*lmsgs))) == NULL)
63 62 return (NULL);
64 63 lmsgs = ldata->l_data[0];
65 64
66 65 ret = __part_load_locale(name, (char **)&ldata->l_data[1],
67 66 "LC_MESSAGES", LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN,
68 67 (const char **)lmsgs);
69 68
70 69 if (ret != _LDP_LOADED) {
71 - __locdata_release(ldata);
70 + __locdata_free(ldata);
72 71 errno = EINVAL;
73 72 return (NULL);
74 73 }
75 74
76 75 if (lmsgs->yesstr == NULL)
77 76 lmsgs->yesstr = empty;
78 77 if (lmsgs->nostr == NULL)
79 78 lmsgs->nostr = empty;
80 79
81 80 return (ldata);
82 81 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX