d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use const where needed instead of using pragmas to work around the warnings

Browse Source
This commit is contained in:
Baptiste Daroussin 2015-11-07 20:29:23 +00:00
parent 557a07f08a
commit a0e395a47f
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/localedef/charmap.c
View File

@ -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);
}

4
usr.bin/localedef/localedef.h
View File

@ -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);