Remove wps_reset(), and rename skin_data_init to skin_data_reset() and extend it to zero most of the wps_data members.

As these are called when parsing a skin it doesn't need to be called by the wps or settings, so make it local to skin_parser.c.
Reorder the members of struct wps_data for more effecient alignment.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23171 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 4 deletions

diff --git a/apps/settings.c b/apps/settings.c
index ce888c44c5..2a5e31824f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -741,25 +741,25 @@ void settings_apply_skins(void)
     /* re-initialize the skin buffer before we start reloading skins */
     skin_buffer_init();
     if ( global_settings.wps_file[0] &&
-        global_settings.wps_file[0] != 0xff ) {
+        global_settings.wps_file[0] != 0xff )
+    {
         snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
                 global_settings.wps_file);
         wps_data_load(SCREEN_MAIN, buf, true);
     }
     else
     {
-        wps_data_init(SCREEN_MAIN);
         wps_data_load(SCREEN_MAIN, NULL, true);
     }
 #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
-    if ( global_settings.rwps_file[0]) {
+    if ( global_settings.rwps_file[0])
+    {
         snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
                 global_settings.rwps_file);
         wps_data_load(SCREEN_REMOTE, buf, true);
     }
     else
     {
-        wps_data_init(SCREEN_REMOTE);
         wps_data_load(SCREEN_REMOTE, NULL, true);
     }
 #endif