Module Name: src
Committed By: christos
Date: Wed Mar 21 14:11:24 UTC 2012
Modified Files:
src/lib/libc/locale: fix_grouping.c global_locale.c
Log Message:
cast CHAR_MAX to (char) for unsigned character machines
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/locale/fix_grouping.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/locale/global_locale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/locale/fix_grouping.c
diff -u src/lib/libc/locale/fix_grouping.c:1.5 src/lib/libc/locale/fix_grouping.c:1.6
--- src/lib/libc/locale/fix_grouping.c:1.5 Tue Jun 1 09:52:08 2010
+++ src/lib/libc/locale/fix_grouping.c Wed Mar 21 10:11:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fix_grouping.c,v 1.5 2010/06/01 13:52:08 tnozaki Exp $ */
+/* $NetBSD: fix_grouping.c,v 1.6 2012/03/21 14:11:24 christos Exp $ */
/*
* Copyright (c) 2001 Alexey Zelkin <[email protected]>
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fix_grouping.c,v 1.5 2010/06/01 13:52:08 tnozaki Exp $");
+__RCSID("$NetBSD: fix_grouping.c,v 1.6 2012/03/21 14:11:24 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <limits.h>
@@ -44,7 +44,7 @@ __RCSID("$NetBSD: fix_grouping.c,v 1.5 2
#include "fix_grouping.h"
#ifndef NBCHAR_MAX
-#define NBCHAR_MAX CHAR_MAX
+#define NBCHAR_MAX (char)CHAR_MAX
#endif
#ifndef __UNCONST
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.12 src/lib/libc/locale/global_locale.c:1.13
--- src/lib/libc/locale/global_locale.c:1.12 Fri Jan 20 11:31:29 2012
+++ src/lib/libc/locale/global_locale.c Wed Mar 21 10:11:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.12 2012/01/20 16:31:29 joerg Exp $ */
+/* $NetBSD: global_locale.c,v 1.13 2012/03/21 14:11:24 christos Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.12 2012/01/20 16:31:29 joerg Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.13 2012/03/21 14:11:24 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -43,6 +43,10 @@ __RCSID("$NetBSD: global_locale.c,v 1.12
#include "runetype_local.h"
#include "setlocale_local.h"
+#ifndef NBCHAR_MAX
+#define NBCHAR_MAX (char)CHAR_MAX
+#endif
+
static struct lconv _global_ldata = {
.decimal_point = __UNCONST("."),
.thousands_sep = __UNCONST(""),
@@ -54,20 +58,20 @@ static struct lconv _global_ldata = {
.mon_grouping = __UNCONST(""),
.positive_sign = __UNCONST(""),
.negative_sign = __UNCONST(""),
- .int_frac_digits = CHAR_MAX,
- .frac_digits = CHAR_MAX,
- .p_cs_precedes = CHAR_MAX,
- .p_sep_by_space = CHAR_MAX,
- .n_cs_precedes = CHAR_MAX,
- .n_sep_by_space = CHAR_MAX,
- .p_sign_posn = CHAR_MAX,
- .n_sign_posn = CHAR_MAX,
- .int_p_cs_precedes = CHAR_MAX,
- .int_n_cs_precedes = CHAR_MAX,
- .int_p_sep_by_space = CHAR_MAX,
- .int_n_sep_by_space = CHAR_MAX,
- .int_p_sign_posn = CHAR_MAX,
- .int_n_sign_posn = CHAR_MAX,
+ .int_frac_digits = NBCHAR_MAX,
+ .frac_digits = NBCHAR_MAX,
+ .p_cs_precedes = NBCHAR_MAX,
+ .p_sep_by_space = NBCHAR_MAX,
+ .n_cs_precedes = NBCHAR_MAX,
+ .n_sep_by_space = NBCHAR_MAX,
+ .p_sign_posn = NBCHAR_MAX,
+ .n_sign_posn = NBCHAR_MAX,
+ .int_p_cs_precedes = NBCHAR_MAX,
+ .int_n_cs_precedes = NBCHAR_MAX,
+ .int_p_sep_by_space = NBCHAR_MAX,
+ .int_n_sep_by_space = NBCHAR_MAX,
+ .int_p_sign_posn = NBCHAR_MAX,
+ .int_n_sign_posn = NBCHAR_MAX,
};
static const char *_global_items[(size_t)ALT_DIGITS + 1] = {
