From owner-svn-src-stable-10@freebsd.org  Sun Dec 27 19:47:57 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 5D055A53E62;
 Sun, 27 Dec 2015 19:47:57 +0000 (UTC)
 (envelope-from marius@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 2B04D1EB3;
 Sun, 27 Dec 2015 19:47:57 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBRJlutu071702;
 Sun, 27 Dec 2015 19:47:56 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBRJlu1O071701;
 Sun, 27 Dec 2015 19:47:56 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201512271947.tBRJlu1O071701@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 27 Dec 2015 19:47:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292790 - stable/10/sys/dev/vt/colors
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Dec 2015 19:47:57 -0000

Author: marius
Date: Sun Dec 27 19:47:56 2015
New Revision: 292790
URL: https://svnweb.freebsd.org/changeset/base/292790

Log:
  MFC: r285912
  
  - Use __FBSDID().
  - Const'ify cons_to_vga_colors.
  - Fix line wrapping.

Modified:
  stable/10/sys/dev/vt/colors/vt_termcolors.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/vt/colors/vt_termcolors.c
==============================================================================
--- stable/10/sys/dev/vt/colors/vt_termcolors.c	Sun Dec 27 19:37:47 2015	(r292789)
+++ stable/10/sys/dev/vt/colors/vt_termcolors.c	Sun Dec 27 19:47:56 2015	(r292790)
@@ -25,15 +25,16 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <dev/vt/colors/vt_termcolors.h>
 
-static struct {
+static const struct {
 	unsigned char r;	/* Red percentage value. */
 	unsigned char g;	/* Green percentage value. */
 	unsigned char b;	/* Blue percentage value. */
@@ -68,8 +69,8 @@ static const int cons_to_vga_colors[16] 
 };
 
 int
-vt_generate_cons_palette(uint32_t *palette, int format, uint32_t rmax, int roffset,
-    uint32_t gmax, int goffset, uint32_t bmax, int boffset)
+vt_generate_cons_palette(uint32_t *palette, int format, uint32_t rmax,
+    int roffset, uint32_t gmax, int goffset, uint32_t bmax, int boffset)
 {
 	int i;