option_string clean-up and consolidate with metadata_common

Change-Id: I2649f6af37bd871fb8f181ae2f716ff0bcf1f65c

1 files changed, 4 insertions, 8 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index bb6ec7c421..a9b1ef4706 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -601,7 +601,7 @@ static int parse_viewporttextstyle(struct skin_element *element,
     *line = (struct line_desc)LINE_DESC_DEFINIT;
     unsigned colour;
 
-    const char *vp_options[] = { "invert", "color", "colour",
+    static const char *vp_options[] = { "invert", "color", "colour",
                                  "clear", "gradient", NULL};
 
     int vp_op = string_option(mode, vp_options, false);
@@ -1054,15 +1054,11 @@ static int parse_progressbar_tag(struct skin_element* element,
         eBACKDROP, eVERTICAL, eHORIZONTAL, eNOTOUCH, eSETTING
     };
 
-    const char *pb_options[] = {"invert", "nofill", "noborder, nobar", "slider",
+    static const char *pb_options[] = {"invert", "nofill", "noborder, nobar", "slider",
                                 "image", "backdrop", "vertical", "horizontal",
                                 "notouch", "setting", NULL};
-
     int pb_op;
 
-
-
-
     while (curr_param < element->params_count)
     {
         char* text;
@@ -1402,7 +1398,7 @@ static int parse_skinvar(  struct skin_element *element,
             return 0;
         case SKIN_TOKEN_VAR_SET:
         {
-            const char *sv_options[] = {"touch", "set", "inc", "dec", NULL};
+            static const char *sv_options[] = {"touch", "set", "inc", "dec", NULL};
 
             struct skin_var_changer *data = skin_buffer_alloc(sizeof(*data));
             if (!data)
@@ -1706,7 +1702,7 @@ static int parse_touchregion(struct skin_element *element,
         if (region->action == ACTION_NONE)
             return WPS_ERROR_INVALID_PARAM;
     }
-    const char *pm_options[] = {"allow_while_locked", "reverse_bar",
+    static const char *pm_options[] = {"allow_while_locked", "reverse_bar",
                                 "repeat_press", "long_press", NULL};
     int pm_op;