Author: bapt
Date: Sun Nov 8 21:22:24 2015
New Revision: 290559
URL: https://svnweb.freebsd.org/changeset/base/290559
Log:
Eliminate some gcc pragmas
Modified:
head/usr.bin/localedef/collate.c
head/usr.bin/localedef/wide.c
Modified: head/usr.bin/localedef/collate.c
==============================================================================
--- head/usr.bin/localedef/collate.c Sun Nov 8 21:08:31 2015
(r290558)
+++ head/usr.bin/localedef/collate.c Sun Nov 8 21:22:24 2015
(r290559)
@@ -435,24 +435,19 @@ subst_compare(const void *n1, const void
RB_GENERATE_STATIC(substs, subst, entry, subst_compare);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-
static int
subst_compare_ref(const void *n1, const void *n2)
{
- int32_t *c1 = ((subst_t *)n1)->ref;
- int32_t *c2 = ((subst_t *)n2)->ref;
+ const wchar_t *c1 = ((const subst_t *)n1)->ref;
+ const wchar_t *c2 = ((const subst_t *)n2)->ref;
int rv;
- rv = wcscmp((wchar_t *)c1, (wchar_t *)c2);
+ rv = wcscmp(c1, c2);
return ((rv < 0) ? -1 : (rv > 0) ? 1 : 0);
}
RB_GENERATE_STATIC(substs_ref, subst, entry_ref, subst_compare_ref);
-#pragma GCC diagnostic pop
-
void
init_collate(void)
{
Modified: head/usr.bin/localedef/wide.c
==============================================================================
--- head/usr.bin/localedef/wide.c Sun Nov 8 21:08:31 2015
(r290558)
+++ head/usr.bin/localedef/wide.c Sun Nov 8 21:22:24 2015
(r290559)
@@ -310,15 +310,12 @@ tomb_utf8(char *mb, wchar_t wc)
* 0x8000 - 0xffff - 2 byte encoding
*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-
static int
towide_dbcs(wchar_t *wc, const char *mb, unsigned n)
{
wchar_t c;
- c = *(uint8_t *)mb;
+ c = *(const uint8_t *)mb;
if ((c & 0x80) == 0) {
/* 7-bit */
@@ -408,7 +405,7 @@ towide_gb18030(wchar_t *wc, const char *
{
wchar_t c;
- c = *(uint8_t *)mb;
+ c = *(const uint8_t *)mb;
if ((c & 0x80) == 0) {
/* 7-bit */
@@ -451,7 +448,7 @@ towide_mskanji(wchar_t *wc, const char *
{
wchar_t c;
- c = *(uint8_t *)mb;
+ c = *(const uint8_t *)mb;
if ((c < 0x80) || ((c > 0xa0) && (c < 0xe0))) {
/* 7-bit */
@@ -487,7 +484,7 @@ towide_euc_impl(wchar_t *wc, const char
int width = 2;
wchar_t c;
- c = *(uint8_t *)mb;
+ c = *(const uint8_t *)mb;
/*
* All variations of EUC encode 7-bit ASCII as one byte, and use
@@ -528,8 +525,6 @@ towide_euc_impl(wchar_t *wc, const char
return (width);
}
-#pragma GCC diagnostic pop
-
/*
* EUC-CN encodes as follows:
*
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
