From owner-svn-src-all@freebsd.org Sat Nov 7 20:29:25 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E4E6A28A3A; Sat, 7 Nov 2015 20:29:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C618F17F8; Sat, 7 Nov 2015 20:29:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7KTNnQ071018; Sat, 7 Nov 2015 20:29:23 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7KTNbu071016; Sat, 7 Nov 2015 20:29:23 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511072029.tA7KTNbu071016@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 20:29:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290511 - head/usr.bin/localedef X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 20:29:25 -0000 Author: bapt Date: Sat Nov 7 20:29:23 2015 New Revision: 290511 URL: https://svnweb.freebsd.org/changeset/base/290511 Log: Use const where needed instead of using pragmas to work around the warnings Modified: head/usr.bin/localedef/charmap.c head/usr.bin/localedef/localedef.h Modified: head/usr.bin/localedef/charmap.c ============================================================================== --- head/usr.bin/localedef/charmap.c Sat Nov 7 20:27:31 2015 (r290510) +++ head/usr.bin/localedef/charmap.c Sat Nov 7 20:29:23 2015 (r290511) @@ -68,11 +68,8 @@ RB_GENERATE_STATIC(cmap_wc, charmap, rb_ * 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, } 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 } void -add_charmap_char(char *name, int val) +add_charmap_char(const char *name, int val) { add_charmap_impl(name, val, 0); } Modified: head/usr.bin/localedef/localedef.h ============================================================================== --- head/usr.bin/localedef/localedef.h Sat Nov 7 20:27:31 2015 (r290510) +++ head/usr.bin/localedef/localedef.h Sat Nov 7 20:29:23 2015 (r290511) @@ -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);