From 6933dd0d856ff54d6f46e0326ba843f70113b486 Mon Sep 17 00:00:00 2001
From: marius <marius@FreeBSD.org>
Date: Sun, 27 Dec 2015 19:47:56 +0000
Subject: MFC: r285912

- Use __FBSDID().
- Const'ify cons_to_vga_colors.
- Fix line wrapping.
---
 sys/dev/vt/colors/vt_termcolors.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/vt/colors/vt_termcolors.c b/sys/dev/vt/colors/vt_termcolors.c
index d8a5909..5075619 100644
--- a/sys/dev/vt/colors/vt_termcolors.c
+++ b/sys/dev/vt/colors/vt_termcolors.c
@@ -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;
 
-- 
cgit v1.1