lkml.org 
[lkml]   [2015]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] char/nvram: set array of const as const
Date
Some array of const char are not set as const.
This patch fix that.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
---
drivers/char/nvram.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 97c2d8d..cb901b3 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -508,12 +508,12 @@ static void pc_set_checksum(void)

#ifdef CONFIG_PROC_FS

-static char *floppy_types[] = {
+static const char * const floppy_types[] = {
"none", "5.25'' 360k", "5.25'' 1.2M", "3.5'' 720k", "3.5'' 1.44M",
"3.5'' 2.88M", "3.5'' 2.88M"
};

-static char *gfx_types[] = {
+static const char * const gfx_types[] = {
"EGA, VGA, ... (with BIOS)",
"CGA (40 cols)",
"CGA (80 cols)",
@@ -614,7 +614,7 @@ static void atari_set_checksum(void)

static struct {
unsigned char val;
- char *name;
+ const char *name;
} boot_prefs[] = {
{ 0x80, "TOS" },
{ 0x40, "ASV" },
@@ -623,7 +623,7 @@ static struct {
{ 0x00, "unspecified" }
};

-static char *languages[] = {
+static const char * const languages[] = {
"English (US)",
"German",
"French",
@@ -635,7 +635,7 @@ static char *languages[] = {
"Swiss (German)"
};

-static char *dateformat[] = {
+static const char * const dateformat[] = {
"MM%cDD%cYY",
"DD%cMM%cYY",
"YY%cMM%cDD",
@@ -646,7 +646,7 @@ static char *dateformat[] = {
"7 (undefined)"
};

-static char *colors[] = {
+static const char * const colors[] = {
"2", "4", "16", "256", "65536", "??", "??", "??"
};

--
2.4.10


\
 
 \ /
  Last update: 2015-11-05 11:01    [W:0.064 / U:0.436 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site