Re: [PATCH] kconfig: constify XPM data

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

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



[Index of Archives]     [Linux&nblp;USB Development]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite Secrets]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux