From owner-svn-src-head@freebsd.org Thu May 10 16:41:48 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC370FCFD1F; Thu, 10 May 2018 16:41:47 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A008A83809; Thu, 10 May 2018 16:41:47 +0000 (UTC) (envelope-from dumbbell@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8145D2301A; Thu, 10 May 2018 16:41:47 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4AGfl0s093192; Thu, 10 May 2018 16:41:47 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4AGflMU093191; Thu, 10 May 2018 16:41:47 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201805101641.w4AGflMU093191@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Thu, 10 May 2018 16:41:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333463 - head/sys/dev/vt/colors X-SVN-Group: head X-SVN-Commit-Author: dumbbell X-SVN-Commit-Paths: head/sys/dev/vt/colors X-SVN-Commit-Revision: 333463 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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: Thu, 10 May 2018 16:41:48 -0000 Author: dumbbell Date: Thu May 10 16:41:47 2018 New Revision: 333463 URL: https://svnweb.freebsd.org/changeset/base/333463 Log: vt(4): Put for() loop outside switch() in vt_generate_cons_palette() This makes it more logical: 1. It checks the requested color format 2. It fills the palette accordingly Also vt_palette_init() is only called when needed (i.e. when the format is `COLOR_FORMAT_RGB`). Modified: head/sys/dev/vt/colors/vt_termcolors.c Modified: head/sys/dev/vt/colors/vt_termcolors.c ============================================================================== --- head/sys/dev/vt/colors/vt_termcolors.c Thu May 10 16:19:41 2018 (r333462) +++ head/sys/dev/vt/colors/vt_termcolors.c Thu May 10 16:41:47 2018 (r333463) @@ -171,21 +171,21 @@ vt_generate_cons_palette(uint32_t *palette, int format { int i; - vt_palette_init(); - -#define CF(_f, _i) ((_f ## max * color_def[(_i)]._f / 100) << _f ## offset) - for (i = 0; i < NCOLORS; i++) { - switch (format) { - case COLOR_FORMAT_VGA: + switch (format) { + case COLOR_FORMAT_VGA: + for (i = 0; i < NCOLORS; i++) palette[i] = cons_to_vga_colors[i]; - break; - case COLOR_FORMAT_RGB: + break; + case COLOR_FORMAT_RGB: + vt_palette_init(); +#define CF(_f, _i) ((_f ## max * color_def[(_i)]._f / 100) << _f ## offset) + for (i = 0; i < NCOLORS; i++) palette[i] = CF(r, i) | CF(g, i) | CF(b, i); - break; - default: - return (ENODEV); - } - } #undef CF + break; + default: + return (ENODEV); + } + return (0); }