From owner-svn-src-head@FreeBSD.ORG Sun Nov 6 17:20:45 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36BC5106564A; Sun, 6 Nov 2011 17:20:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D2F08FC13; Sun, 6 Nov 2011 17:20:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6HKijU032383; Sun, 6 Nov 2011 17:20:44 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6HKidM032380; Sun, 6 Nov 2011 17:20:44 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111061720.pA6HKidM032380@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 17:20:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227228 - head/usr.bin/chpass X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 17:20:45 -0000 Author: ed Date: Sun Nov 6 17:20:44 2011 New Revision: 227228 URL: http://svn.freebsd.org/changeset/base/227228 Log: Mark the structure fields as const. This allows us to simply place these strings as constants in the table itself, letting the compiler decide to simply merge duplicate strings. Modified: head/usr.bin/chpass/chpass.h head/usr.bin/chpass/table.c Modified: head/usr.bin/chpass/chpass.h ============================================================================== --- head/usr.bin/chpass/chpass.h Sun Nov 6 16:58:17 2011 (r227227) +++ head/usr.bin/chpass/chpass.h Sun Nov 6 17:20:44 2011 (r227228) @@ -48,7 +48,7 @@ typedef struct _entry { int (*func)(char *, struct passwd *, struct _entry *); int restricted; size_t len; - char *except, *save; + const char *except, *save; } ENTRY; /* Field numbers. */ Modified: head/usr.bin/chpass/table.c ============================================================================== --- head/usr.bin/chpass/table.c Sun Nov 6 16:58:17 2011 (r227227) +++ head/usr.bin/chpass/table.c Sun Nov 6 17:20:44 2011 (r227228) @@ -39,27 +39,24 @@ __FBSDID("$FreeBSD$"); #include #include "chpass.h" -char e1[] = ": "; -char e2[] = ":,"; - ENTRY list[] = { - { "login", p_login, 1, 5, e1, NULL }, - { "password", p_passwd, 1, 8, e1, NULL }, - { "uid", p_uid, 1, 3, e1, NULL }, - { "gid", p_gid, 1, 3, e1, NULL }, - { "class", p_class, 1, 5, e1, NULL }, + { "login", p_login, 1, 5, ": ", NULL }, + { "password", p_passwd, 1, 8, ": ", NULL }, + { "uid", p_uid, 1, 3, ": ", NULL }, + { "gid", p_gid, 1, 3, ": ", NULL }, + { "class", p_class, 1, 5, ": ", NULL }, { "change", p_change, 1, 6, NULL, NULL }, { "expire", p_expire, 1, 6, NULL, NULL }, #ifdef RESTRICT_FULLNAME_CHANGE /* do not allow fullname changes */ - { "full name", p_gecos, 1, 9, e2, NULL }, + { "full name", p_gecos, 1, 9, ":,", NULL }, #else - { "full name", p_gecos, 0, 9, e2, NULL }, + { "full name", p_gecos, 0, 9, ":,", NULL }, #endif - { "office phone", p_gecos, 0, 12, e2, NULL }, - { "home phone", p_gecos, 0, 10, e2, NULL }, - { "office location", p_gecos, 0, 15, e2, NULL }, - { "other information", p_gecos, 0, 11, e1, NULL }, - { "home directory", p_hdir, 1, 14, e1, NULL }, - { "shell", p_shell, 0, 5, e1, NULL }, + { "office phone", p_gecos, 0, 12, ":,", NULL }, + { "home phone", p_gecos, 0, 10, ":,", NULL }, + { "office location", p_gecos, 0, 15, ":,", NULL }, + { "other information", p_gecos, 0, 11, ": ", NULL }, + { "home directory", p_hdir, 1, 14, ": ", NULL }, + { "shell", p_shell, 0, 5, ": ", NULL }, { NULL, NULL, 0, 0, NULL, NULL }, };