Get rid of get_user_file_path and do the path handling in wrappers for open() and friends.

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

5 files changed, 10 insertions, 24 deletions

diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index c4581e0..628196a 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -228,12 +228,9 @@ static void load_icons(const char* filename, enum Iconset iconset)
     if (filename[0] && filename[0] != '-')
     {
         char path[MAX_PATH];
-        char temp[MAX_PATH];
-        const char * fname;
         
-        snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR, filename);
-        fname = get_user_file_path(path, IS_FILE, temp, sizeof(temp));
-        size_read = read_bmp_file(fname, bmp, IMG_BUFSIZE, bmpformat, NULL);
+        snprintf(path, sizeof(path), ICON_DIR "/%s.bmp", filename);
+        size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, bmpformat, NULL);
         if (size_read > 0)
         {
             *loaded_ok = true;
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index e337774..3e04bea 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -54,7 +54,6 @@ void skin_backdrop_init(void)
 int skin_backdrop_assign(char* backdrop, char *bmpdir,
                          enum screen_type screen)
 {
-    char dir[MAX_PATH];
     char filename[MAX_PATH];
     int i, free = -1;
     if (!backdrop)
@@ -68,8 +67,7 @@ int skin_backdrop_assign(char* backdrop, char *bmpdir,
     }
     else
     {
-        const char *bd_dir = get_user_file_path(bmpdir, 0, dir, sizeof(dir));
-        get_image_filename(backdrop, bd_dir, filename, sizeof(filename));
+        get_image_filename(backdrop, bmpdir, filename, sizeof(filename));
     }
     for (i=0; i<NB_BDROPS; i++)
     {
@@ -115,12 +113,9 @@ bool skin_backdrops_preload(void)
             if (screen == SCREEN_MAIN && global_settings.backdrop_file[0] &&
                 global_settings.backdrop_file[0] != '-' && filename[0] == '-')
             {
-                char dir[MAX_PATH];
                 char* temp = filename+2; /* slightly hacky to get a buffer */
                 size_t size = sizeof(backdrops[i].name) - 2;
-                snprintf(temp, size, "%s/%s.bmp",
-                         get_user_file_path(BACKDROP_DIR, 0, dir, sizeof(dir)),
-                         global_settings.backdrop_file);
+                snprintf(temp, size, BACKDROP_DIR "/%s.bmp", global_settings.backdrop_file);
                 filename = temp;
             }
             if (*filename && *filename != '-')
@@ -161,7 +156,7 @@ void skin_backdrop_unload(int backdrop_id)
 void skin_backdrop_load_setting(void)
 {
     int i;
-    char filename[MAX_PATH], dir[MAX_PATH];
+    char filename[MAX_PATH];
     for(i=0;i<SKINNABLE_SCREENS_COUNT*NB_SCREENS;i++)
     {
         if (backdrops[i].name[0] == '-' && backdrops[i].screen == SCREEN_MAIN)
@@ -171,8 +166,7 @@ void skin_backdrop_load_setting(void)
             {
                 if (!backdrops[i].buffer)
                     backdrops[i].buffer = (char*)skin_buffer_alloc(LCD_BACKDROP_BYTES);
-                snprintf(filename, sizeof filename, "%s/%s.bmp",
-                         get_user_file_path(BACKDROP_DIR, 0, dir, sizeof(dir)),
+                snprintf(filename, sizeof filename, BACKDROP_DIR "/%s.bmp",
                          global_settings.backdrop_file);
                 bool loaded = backdrops[i].buffer && 
                               screens[SCREEN_MAIN].backdrop_load(filename,
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index 25baeb2..fbedbb9 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -155,7 +155,7 @@ struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type scre
 {
     if (!loading_a_sbs && skins[skin][screen].data.wps_loaded == false)
     {
-        char buf[MAX_PATH*2], path[MAX_PATH];
+        char buf[MAX_PATH*2];
         char *setting = NULL, *ext = NULL;
         switch (skin)
         {
@@ -226,9 +226,7 @@ struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type scre
         buf[0] = '\0'; /* force it to reload the default */
         if (strcmp(setting, "rockbox_failsafe"))
         {
-            snprintf(buf, sizeof buf, "%s/%s.%s",
-                 get_user_file_path(WPS_DIR, false, path, sizeof(path)),
-                 setting, ext);
+            snprintf(buf, sizeof buf, WPS_DIR "/%s.%s", setting, ext);
         }
         cpu_boost(true);
         skin_load(skin, screen, buf, true);
diff --git a/apps/gui/skin_engine/skin_fonts.c b/apps/gui/skin_engine/skin_fonts.c
index e5081e8..23255aa 100644
--- a/apps/gui/skin_engine/skin_fonts.c
+++ b/apps/gui/skin_engine/skin_fonts.c
@@ -64,7 +64,6 @@ int skin_font_load(char* font_name, int glyphs)
     struct font *pf;
     struct skin_font_info *font = NULL;
     char filename[MAX_PATH];
-    char tmp[MAX_PATH];
     
     if (!strcmp(font_name, global_settings.font_file))
         return FONT_UI;
@@ -72,8 +71,7 @@ int skin_font_load(char* font_name, int glyphs)
     if (!strcmp(font_name, global_settings.remote_font_file))
         return FONT_UI_REMOTE;
 #endif
-    snprintf(tmp, MAX_PATH, FONT_DIR "/%s.fnt", font_name);
-    get_user_file_path(tmp, FORCE_BUFFER_COPY, filename, sizeof(filename));
+    snprintf(filename, MAX_PATH, FONT_DIR "/%s.fnt", font_name);
     
     for(i=0;i<MAXUSERFONTS;i++)
     {
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 4da1384..f292ff3 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1646,8 +1646,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
         strlcpy(bmpdir, buf, dot - buf + 1);
     }
     else
-    {   /* fall back to backdrop dir for built-in themes */
-        /* no get_user_file_path(), assuming we ship bmps for built-in themes */
+    {
         snprintf(bmpdir, MAX_PATH, "%s", BACKDROP_DIR);
     }
     /* load the bitmaps that were found by the parsing */