diff options
author | bapt <bapt@FreeBSD.org> | 2015-11-07 20:29:23 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-11-07 20:29:23 +0000 |
commit | 4e4bd7df36b05081c750c3d6b7a46733aab59f66 (patch) | |
tree | 159f6ceb95dd24cfba51b6081fecca6ad38f501a /usr.bin/localedef | |
parent | cf3dd7e45d779c2a7c4b00ef8c8f7c235479520a (diff) | |
download | FreeBSD-src-4e4bd7df36b05081c750c3d6b7a46733aab59f66.zip FreeBSD-src-4e4bd7df36b05081c750c3d6b7a46733aab59f66.tar.gz |
Use const where needed instead of using pragmas to work around the warnings
Diffstat (limited to 'usr.bin/localedef')
-rw-r--r-- | usr.bin/localedef/charmap.c | 13 | ||||
-rw-r--r-- | usr.bin/localedef/localedef.h | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index 91a25bc..0c64873 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -68,11 +68,8 @@ RB_GENERATE_STATIC(cmap_wc, charmap, rb_wc, cmap_compare_wc); * Array of POSIX specific portable characters. */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" - static const struct { - char *name; + const char *name; int ch; } portable_chars[] = { { "NUL", '\0' }, @@ -189,8 +186,6 @@ static const struct { { NULL, 0 } }; -#pragma GCC diagnostic pop - static int cmap_compare_sym(const void *n1, const void *n2) { @@ -220,7 +215,7 @@ init_charmap(void) } static void -add_charmap_impl(char *sym, wchar_t wc, int nodups) +add_charmap_impl(const char *sym, wchar_t wc, int nodups) { charmap_t srch; charmap_t *n = NULL; @@ -260,7 +255,7 @@ add_charmap_impl(char *sym, wchar_t wc, int nodups) } void -add_charmap(char *sym, int c) +add_charmap(const char *sym, int c) { add_charmap_impl(sym, c, 1); } @@ -322,7 +317,7 @@ add_charmap_range(char *s, char *e, int wc) } void -add_charmap_char(char *name, int val) +add_charmap_char(const char *name, int val) { add_charmap_impl(name, val, 0); } diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h index 91e47ad..7805d37 100644 --- a/usr.bin/localedef/localedef.h +++ b/usr.bin/localedef/localedef.h @@ -76,11 +76,11 @@ wchar_t *get_wcs(void); /* charmap.c - CHARMAP handling */ void init_charmap(void); -void add_charmap(char *, int); +void add_charmap(const char *, int); void add_charmap_undefined(char *); void add_charmap_posix(void); void add_charmap_range(char *, char *, int); -void add_charmap_char(char *name, int val); +void add_charmap_char(const char *name, int val); int lookup_charmap(const char *, wchar_t *); int check_charmap_undefined(char *); int check_charmap(wchar_t); |