All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kconfig: constify XPM data
@ 2020-07-18  6:38 Masahiro Yamada
  2020-07-24 17:23 ` Masahiro Yamada
  0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2020-07-18  6:38 UTC (permalink / raw)
  To: linux-kbuild; +Cc: Masahiro Yamada, linux-kernel

Constify arrays as well as strings.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/kconfig/images.c | 30 +++++++++++++++---------------
 scripts/kconfig/images.h | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c
index b4fa0e4a63a5..2f9afffa5d79 100644
--- a/scripts/kconfig/images.c
+++ b/scripts/kconfig/images.c
@@ -5,7 +5,7 @@
 
 #include "images.h"
 
-const char *xpm_load[] = {
+const char * const xpm_load[] = {
 "22 22 5 1",
 ". c None",
 "# c #000000",
@@ -35,7 +35,7 @@ const char *xpm_load[] = {
 "###############.......",
 "......................"};
 
-const char *xpm_save[] = {
+const char * const xpm_save[] = {
 "22 22 5 1",
 ". c None",
 "# c #000000",
@@ -65,7 +65,7 @@ const char *xpm_save[] = {
 "..##################..",
 "......................"};
 
-const char *xpm_back[] = {
+const char * const xpm_back[] = {
 "22 22 3 1",
 ". c None",
 "# c #000083",
@@ -93,7 +93,7 @@ const char *xpm_back[] = {
 "......................",
 "......................"};
 
-const char *xpm_tree_view[] = {
+const char * const xpm_tree_view[] = {
 "22 22 2 1",
 ". c None",
 "# c #000000",
@@ -120,7 +120,7 @@ const char *xpm_tree_view[] = {
 "......................",
 "......................"};
 
-const char *xpm_single_view[] = {
+const char * const xpm_single_view[] = {
 "22 22 2 1",
 ". c None",
 "# c #000000",
@@ -147,7 +147,7 @@ const char *xpm_single_view[] = {
 "......................",
 "......................"};
 
-const char *xpm_split_view[] = {
+const char * const xpm_split_view[] = {
 "22 22 2 1",
 ". c None",
 "# c #000000",
@@ -174,7 +174,7 @@ const char *xpm_split_view[] = {
 "......................",
 "......................"};
 
-const char *xpm_symbol_no[] = {
+const char * const xpm_symbol_no[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -191,7 +191,7 @@ const char *xpm_symbol_no[] = {
 " .......... ",
 "            "};
 
-const char *xpm_symbol_mod[] = {
+const char * const xpm_symbol_mod[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -208,7 +208,7 @@ const char *xpm_symbol_mod[] = {
 " .......... ",
 "            "};
 
-const char *xpm_symbol_yes[] = {
+const char * const xpm_symbol_yes[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -225,7 +225,7 @@ const char *xpm_symbol_yes[] = {
 " .......... ",
 "            "};
 
-const char *xpm_choice_no[] = {
+const char * const xpm_choice_no[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -242,7 +242,7 @@ const char *xpm_choice_no[] = {
 "    ....    ",
 "            "};
 
-const char *xpm_choice_yes[] = {
+const char * const xpm_choice_yes[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -259,7 +259,7 @@ const char *xpm_choice_yes[] = {
 "    ....    ",
 "            "};
 
-const char *xpm_menu[] = {
+const char * const xpm_menu[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -276,7 +276,7 @@ const char *xpm_menu[] = {
 " .......... ",
 "            "};
 
-const char *xpm_menu_inv[] = {
+const char * const xpm_menu_inv[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -293,7 +293,7 @@ const char *xpm_menu_inv[] = {
 " .......... ",
 "            "};
 
-const char *xpm_menuback[] = {
+const char * const xpm_menuback[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -310,7 +310,7 @@ const char *xpm_menuback[] = {
 " .......... ",
 "            "};
 
-const char *xpm_void[] = {
+const char * const xpm_void[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
diff --git a/scripts/kconfig/images.h b/scripts/kconfig/images.h
index d8ff614bd087..7212dec2006c 100644
--- a/scripts/kconfig/images.h
+++ b/scripts/kconfig/images.h
@@ -10,21 +10,21 @@
 extern "C" {
 #endif
 
-extern const char *xpm_load[];
-extern const char *xpm_save[];
-extern const char *xpm_back[];
-extern const char *xpm_tree_view[];
-extern const char *xpm_single_view[];
-extern const char *xpm_split_view[];
-extern const char *xpm_symbol_no[];
-extern const char *xpm_symbol_mod[];
-extern const char *xpm_symbol_yes[];
-extern const char *xpm_choice_no[];
-extern const char *xpm_choice_yes[];
-extern const char *xpm_menu[];
-extern const char *xpm_menu_inv[];
-extern const char *xpm_menuback[];
-extern const char *xpm_void[];
+extern const char * const xpm_load[];
+extern const char * const xpm_save[];
+extern const char * const xpm_back[];
+extern const char * const xpm_tree_view[];
+extern const char * const xpm_single_view[];
+extern const char * const xpm_split_view[];
+extern const char * const xpm_symbol_no[];
+extern const char * const xpm_symbol_mod[];
+extern const char * const xpm_symbol_yes[];
+extern const char * const xpm_choice_no[];
+extern const char * const xpm_choice_yes[];
+extern const char * const xpm_menu[];
+extern const char * const xpm_menu_inv[];
+extern const char * const xpm_menuback[];
+extern const char * const xpm_void[];
 
 #ifdef __cplusplus
 }
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] kconfig: constify XPM data
  2020-07-18  6:38 [PATCH] kconfig: constify XPM data Masahiro Yamada
@ 2020-07-24 17:23 ` Masahiro Yamada
  0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2020-07-24 17:23 UTC (permalink / raw)
  To: Linux Kbuild mailing list; +Cc: Linux Kernel Mailing List

On Sat, Jul 18, 2020 at 3:39 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Constify arrays as well as strings.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Applied to linux-kbuild.


>  scripts/kconfig/images.c | 30 +++++++++++++++---------------
>  scripts/kconfig/images.h | 30 +++++++++++++++---------------
>  2 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c
> index b4fa0e4a63a5..2f9afffa5d79 100644
> --- a/scripts/kconfig/images.c
> +++ b/scripts/kconfig/images.c
> @@ -5,7 +5,7 @@
>
>  #include "images.h"
>
> -const char *xpm_load[] = {
> +const char * const xpm_load[] = {
>  "22 22 5 1",
>  ". c None",
>  "# c #000000",
> @@ -35,7 +35,7 @@ const char *xpm_load[] = {
>  "###############.......",
>  "......................"};
>
> -const char *xpm_save[] = {
> +const char * const xpm_save[] = {
>  "22 22 5 1",
>  ". c None",
>  "# c #000000",
> @@ -65,7 +65,7 @@ const char *xpm_save[] = {
>  "..##################..",
>  "......................"};
>
> -const char *xpm_back[] = {
> +const char * const xpm_back[] = {
>  "22 22 3 1",
>  ". c None",
>  "# c #000083",
> @@ -93,7 +93,7 @@ const char *xpm_back[] = {
>  "......................",
>  "......................"};
>
> -const char *xpm_tree_view[] = {
> +const char * const xpm_tree_view[] = {
>  "22 22 2 1",
>  ". c None",
>  "# c #000000",
> @@ -120,7 +120,7 @@ const char *xpm_tree_view[] = {
>  "......................",
>  "......................"};
>
> -const char *xpm_single_view[] = {
> +const char * const xpm_single_view[] = {
>  "22 22 2 1",
>  ". c None",
>  "# c #000000",
> @@ -147,7 +147,7 @@ const char *xpm_single_view[] = {
>  "......................",
>  "......................"};
>
> -const char *xpm_split_view[] = {
> +const char * const xpm_split_view[] = {
>  "22 22 2 1",
>  ". c None",
>  "# c #000000",
> @@ -174,7 +174,7 @@ const char *xpm_split_view[] = {
>  "......................",
>  "......................"};
>
> -const char *xpm_symbol_no[] = {
> +const char * const xpm_symbol_no[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -191,7 +191,7 @@ const char *xpm_symbol_no[] = {
>  " .......... ",
>  "            "};
>
> -const char *xpm_symbol_mod[] = {
> +const char * const xpm_symbol_mod[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -208,7 +208,7 @@ const char *xpm_symbol_mod[] = {
>  " .......... ",
>  "            "};
>
> -const char *xpm_symbol_yes[] = {
> +const char * const xpm_symbol_yes[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -225,7 +225,7 @@ const char *xpm_symbol_yes[] = {
>  " .......... ",
>  "            "};
>
> -const char *xpm_choice_no[] = {
> +const char * const xpm_choice_no[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -242,7 +242,7 @@ const char *xpm_choice_no[] = {
>  "    ....    ",
>  "            "};
>
> -const char *xpm_choice_yes[] = {
> +const char * const xpm_choice_yes[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -259,7 +259,7 @@ const char *xpm_choice_yes[] = {
>  "    ....    ",
>  "            "};
>
> -const char *xpm_menu[] = {
> +const char * const xpm_menu[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -276,7 +276,7 @@ const char *xpm_menu[] = {
>  " .......... ",
>  "            "};
>
> -const char *xpm_menu_inv[] = {
> +const char * const xpm_menu_inv[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -293,7 +293,7 @@ const char *xpm_menu_inv[] = {
>  " .......... ",
>  "            "};
>
> -const char *xpm_menuback[] = {
> +const char * const xpm_menuback[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> @@ -310,7 +310,7 @@ const char *xpm_menuback[] = {
>  " .......... ",
>  "            "};
>
> -const char *xpm_void[] = {
> +const char * const xpm_void[] = {
>  "12 12 2 1",
>  "  c white",
>  ". c black",
> diff --git a/scripts/kconfig/images.h b/scripts/kconfig/images.h
> index d8ff614bd087..7212dec2006c 100644
> --- a/scripts/kconfig/images.h
> +++ b/scripts/kconfig/images.h
> @@ -10,21 +10,21 @@
>  extern "C" {
>  #endif
>
> -extern const char *xpm_load[];
> -extern const char *xpm_save[];
> -extern const char *xpm_back[];
> -extern const char *xpm_tree_view[];
> -extern const char *xpm_single_view[];
> -extern const char *xpm_split_view[];
> -extern const char *xpm_symbol_no[];
> -extern const char *xpm_symbol_mod[];
> -extern const char *xpm_symbol_yes[];
> -extern const char *xpm_choice_no[];
> -extern const char *xpm_choice_yes[];
> -extern const char *xpm_menu[];
> -extern const char *xpm_menu_inv[];
> -extern const char *xpm_menuback[];
> -extern const char *xpm_void[];
> +extern const char * const xpm_load[];
> +extern const char * const xpm_save[];
> +extern const char * const xpm_back[];
> +extern const char * const xpm_tree_view[];
> +extern const char * const xpm_single_view[];
> +extern const char * const xpm_split_view[];
> +extern const char * const xpm_symbol_no[];
> +extern const char * const xpm_symbol_mod[];
> +extern const char * const xpm_symbol_yes[];
> +extern const char * const xpm_choice_no[];
> +extern const char * const xpm_choice_yes[];
> +extern const char * const xpm_menu[];
> +extern const char * const xpm_menu_inv[];
> +extern const char * const xpm_menuback[];
> +extern const char * const xpm_void[];
>
>  #ifdef __cplusplus
>  }
> --
> 2.25.1
>


-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-24 17:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-18  6:38 [PATCH] kconfig: constify XPM data Masahiro Yamada
2020-07-24 17:23 ` Masahiro Yamada

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.