svn commit: r292791 - stable/9/sys/dev/vt/colors

[Marius Strobl]

Author: marius
Date: Sun Dec 27 19:48:02 2015
New Revision: 292791
URL: https://svnweb.freebsd.org/changeset/base/292791

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

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

Modified: stable/9/sys/dev/vt/colors/vt_termcolors.c
==============================================================================
--- stable/9/sys/dev/vt/colors/vt_termcolors.c	Sun Dec 27 19:47:56 2015	(r292790)
+++ stable/9/sys/dev/vt/colors/vt_termcolors.c	Sun Dec 27 19:48:02 2015	(r292791)
@@ -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;