| lnumeric.c (101470) | lnumeric.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/lnumeric.c 101470 2002-08-07 16:45:23Z ache $"); | 28__FBSDID("$FreeBSD: head/lib/libc/locale/lnumeric.c 101498 2002-08-08 05:51:54Z ache $"); |
| 29 30#include <limits.h> 31#include "lnumeric.h" 32#include "ldpart.h" 33 34extern int __nlocale_changed; 35extern const char *__fix_locale_grouping_str(const char *); 36 --- 11 unchanged lines hidden (view full) --- 48static int _numeric_using_locale; 49static char *_numeric_locale_buf; 50 51int 52__numeric_load_locale(const char *name) 53{ 54 int ret; 55 | 29 30#include <limits.h> 31#include "lnumeric.h" 32#include "ldpart.h" 33 34extern int __nlocale_changed; 35extern const char *__fix_locale_grouping_str(const char *); 36 --- 11 unchanged lines hidden (view full) --- 48static int _numeric_using_locale; 49static char *_numeric_locale_buf; 50 51int 52__numeric_load_locale(const char *name) 53{ 54 int ret; 55 |
| 56 __nlocale_changed = 1; | |
| 57 ret = __part_load_locale(name, &_numeric_using_locale, 58 _numeric_locale_buf, "LC_NUMERIC", 59 LCNUMERIC_SIZE, LCNUMERIC_SIZE, 60 (const char **)&_numeric_locale); | 56 ret = __part_load_locale(name, &_numeric_using_locale, 57 _numeric_locale_buf, "LC_NUMERIC", 58 LCNUMERIC_SIZE, LCNUMERIC_SIZE, 59 (const char **)&_numeric_locale); |
| 61 if (ret == 0 && _numeric_using_locale) | 60 if (ret != _LDP_ERROR) 61 __nlocale_changed = 1; 62 if (ret == _LDP_LOADED) |
| 62 _numeric_locale.grouping = | 63 _numeric_locale.grouping = |
| 63 __fix_locale_grouping_str(_numeric_locale.grouping); | 64 __fix_locale_grouping_str(_numeric_locale.grouping); |
| 64 return (ret); 65} 66 67struct lc_numeric_T * 68__get_current_numeric_locale(void) 69{ 70 return (_numeric_using_locale 71 ? &_numeric_locale --- 15 unchanged lines hidden --- | 65 return (ret); 66} 67 68struct lc_numeric_T * 69__get_current_numeric_locale(void) 70{ 71 return (_numeric_using_locale 72 ? &_numeric_locale --- 15 unchanged lines hidden --- |