Deleted Added
full compact
lmonetary.c (101470) lmonetary.c (101498)
1/*
2 * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
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) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
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/lmonetary.c 101470 2002-08-07 16:45:23Z ache $");
28__FBSDID("$FreeBSD: head/lib/libc/locale/lmonetary.c 101498 2002-08-08 05:51:54Z ache $");
29
30#include <limits.h>
31#include <stdlib.h>
32#include "lmonetary.h"
33#include "ldpart.h"
34
35extern int __mlocale_changed;
36extern const char * __fix_locale_grouping_str(const char *);

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

58 numempty /* n_sign_posn */
59};
60
61static struct lc_monetary_T _monetary_locale;
62static int _monetary_using_locale;
63static char *_monetary_locale_buf;
64
65static char
29
30#include <limits.h>
31#include <stdlib.h>
32#include "lmonetary.h"
33#include "ldpart.h"
34
35extern int __mlocale_changed;
36extern const char * __fix_locale_grouping_str(const char *);

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

58 numempty /* n_sign_posn */
59};
60
61static struct lc_monetary_T _monetary_locale;
62static int _monetary_using_locale;
63static char *_monetary_locale_buf;
64
65static char
66cnv(const char *str)
66cnv(const char *str)
67{
68 int i = strtol(str, NULL, 10);
69
70 if (i == -1)
71 i = CHAR_MAX;
72 return ((char)i);
73}
74
75int
76__monetary_load_locale(const char *name)
77{
78 int ret;
79
67{
68 int i = strtol(str, NULL, 10);
69
70 if (i == -1)
71 i = CHAR_MAX;
72 return ((char)i);
73}
74
75int
76__monetary_load_locale(const char *name)
77{
78 int ret;
79
80 __mlocale_changed = 1;
81 ret = __part_load_locale(name, &_monetary_using_locale,
82 _monetary_locale_buf, "LC_MONETARY",
83 LCMONETARY_SIZE, LCMONETARY_SIZE,
84 (const char **)&_monetary_locale);
80 ret = __part_load_locale(name, &_monetary_using_locale,
81 _monetary_locale_buf, "LC_MONETARY",
82 LCMONETARY_SIZE, LCMONETARY_SIZE,
83 (const char **)&_monetary_locale);
85 if (ret == 0 && _monetary_using_locale) {
84 if (ret != _LDP_ERROR)
85 __mlocale_changed = 1;
86 if (ret == _LDP_LOADED) {
86 _monetary_locale.mon_grouping =
87 __fix_locale_grouping_str(_monetary_locale.mon_grouping);
88
89#define M_ASSIGN_CHAR(NAME) (((char *)_monetary_locale.NAME)[0] = \
90 cnv(_monetary_locale.NAME))
91
92 M_ASSIGN_CHAR(int_frac_digits);
93 M_ASSIGN_CHAR(frac_digits);
94 M_ASSIGN_CHAR(p_cs_precedes);
95 M_ASSIGN_CHAR(p_sep_by_space);
96 M_ASSIGN_CHAR(n_cs_precedes);
97 M_ASSIGN_CHAR(n_sep_by_space);
98 M_ASSIGN_CHAR(p_sign_posn);
99 M_ASSIGN_CHAR(n_sign_posn);
100 }
101 return (ret);
102}
103
104struct lc_monetary_T *
87 _monetary_locale.mon_grouping =
88 __fix_locale_grouping_str(_monetary_locale.mon_grouping);
89
90#define M_ASSIGN_CHAR(NAME) (((char *)_monetary_locale.NAME)[0] = \
91 cnv(_monetary_locale.NAME))
92
93 M_ASSIGN_CHAR(int_frac_digits);
94 M_ASSIGN_CHAR(frac_digits);
95 M_ASSIGN_CHAR(p_cs_precedes);
96 M_ASSIGN_CHAR(p_sep_by_space);
97 M_ASSIGN_CHAR(n_cs_precedes);
98 M_ASSIGN_CHAR(n_sep_by_space);
99 M_ASSIGN_CHAR(p_sign_posn);
100 M_ASSIGN_CHAR(n_sign_posn);
101 }
102 return (ret);
103}
104
105struct lc_monetary_T *
105__get_current_monetary_locale(void)
106__get_current_monetary_locale(void)
106{
107 return (_monetary_using_locale
108 ? &_monetary_locale
109 : (struct lc_monetary_T *)&_C_monetary_locale);
110}
111
112#ifdef LOCALE_DEBUG
113void

--- 34 unchanged lines hidden ---
107{
108 return (_monetary_using_locale
109 ? &_monetary_locale
110 : (struct lc_monetary_T *)&_C_monetary_locale);
111}
112
113#ifdef LOCALE_DEBUG
114void

--- 34 unchanged lines hidden ---