Deleted Added
full compact
lmonetary.c (92986) lmonetary.c (101470)
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 92986 2002-03-22 21:53:29Z obrien $");
28__FBSDID("$FreeBSD: head/lib/libc/locale/lmonetary.c 101470 2002-08-07 16:45:23Z 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{
67 int i = strtol(str, NULL, 10);
68 int i = strtol(str, NULL, 10);
69
68 if (i == -1)
69 i = CHAR_MAX;
70 if (i == -1)
71 i = CHAR_MAX;
70 return (char)i;
72 return ((char)i);
71}
72
73int
73}
74
75int
74__monetary_load_locale(const char *name) {
75
76__monetary_load_locale(const char *name)
77{
76 int ret;
78 int ret;
79
77 __mlocale_changed = 1;
78 ret = __part_load_locale(name, &_monetary_using_locale,
79 _monetary_locale_buf, "LC_MONETARY",
80 LCMONETARY_SIZE, LCMONETARY_SIZE,
81 (const char **)&_monetary_locale);
82 if (ret == 0 && _monetary_using_locale) {
83 _monetary_locale.mon_grouping =
84 __fix_locale_grouping_str(_monetary_locale.mon_grouping);

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

90 M_ASSIGN_CHAR(frac_digits);
91 M_ASSIGN_CHAR(p_cs_precedes);
92 M_ASSIGN_CHAR(p_sep_by_space);
93 M_ASSIGN_CHAR(n_cs_precedes);
94 M_ASSIGN_CHAR(n_sep_by_space);
95 M_ASSIGN_CHAR(p_sign_posn);
96 M_ASSIGN_CHAR(n_sign_posn);
97 }
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);
85 if (ret == 0 && _monetary_using_locale) {
86 _monetary_locale.mon_grouping =
87 __fix_locale_grouping_str(_monetary_locale.mon_grouping);

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

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 }
98 return ret;
101 return (ret);
99}
100
101struct lc_monetary_T *
102}
103
104struct lc_monetary_T *
102__get_current_monetary_locale(void) {
103
105__get_current_monetary_locale(void)
106{
104 return (_monetary_using_locale
105 ? &_monetary_locale
106 : (struct lc_monetary_T *)&_C_monetary_locale);
107}
108
109#ifdef LOCALE_DEBUG
110void
111monetdebug() {

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

--- 33 unchanged lines hidden ---