Print this page
make: use the more modern wchar routines, not widec.h
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/cmd/make/lib/mksh/i18n.cc
+++ new/usr/src/cmd/make/lib/mksh/i18n.cc
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 24 */
25 25
26 26
27 27 /*
28 28 * i18n.cc
29 29 *
30 30 * Deal with internationalization conversions
31 31 */
32 32
33 33 /*
34 34 * Included files
35 35 */
36 36 #include <mksh/i18n.h>
37 37 #include <mksh/misc.h> /* setup_char_semantics() */
38 38
39 39 /*
40 40 * get_char_semantics_value(ch)
41 41 *
42 42 * Return value:
43 43 * The character semantics of ch.
44 44 *
45 45 * Parameters:
46 46 * ch character we want semantics for.
47 47 *
48 48 */
49 49 char
50 50 get_char_semantics_value(wchar_t ch)
51 51 {
52 52 static Boolean char_semantics_setup;
53 53
54 54 if (!char_semantics_setup) {
55 55 setup_char_semantics();
56 56 char_semantics_setup = true;
57 57 }
58 58 return char_semantics[get_char_semantics_entry(ch)];
59 59 }
60 60
61 61 /*
62 62 * get_char_semantics_entry(ch)
63 63 *
64 64 * Return value:
65 65 * The slot number in the array for special make chars,
66 66 * else the slot number of the last array entry.
67 67 *
68 68 * Parameters:
69 69 * ch The wide character
↓ open down ↓ |
69 lines elided |
↑ open up ↑ |
70 70 *
71 71 * Global variables used:
72 72 * char_semantics_char[] array of special wchar_t chars
73 73 * "&*@`\\|[]:$=!>-\n#()%?;^<'\""
74 74 */
75 75 int
76 76 get_char_semantics_entry(wchar_t ch)
77 77 {
78 78 wchar_t *char_sem_char;
79 79
80 - char_sem_char = (wchar_t *) wschr(char_semantics_char, ch);
80 + char_sem_char = (wchar_t *) wcschr(char_semantics_char, ch);
81 81 if (char_sem_char == NULL) {
82 82 /*
83 83 * Return the integer entry for the last slot,
84 84 * whose content is empty.
85 85 */
86 86 return (CHAR_SEMANTICS_ENTRIES - 1);
87 87 } else {
88 88 return (char_sem_char - char_semantics_char);
89 89 }
90 90 }
91 91
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX