From 2c2416094f426972c9e2e96d25058311bbe82f97 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 6 Dec 2010 22:26:31 +0000 Subject: 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 --- firmware/font.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'firmware/font.c') diff --git a/firmware/font.c b/firmware/font.c index e973108bca..cd74459b1e 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -613,11 +613,7 @@ void glyph_cache_save(struct font* pf) pf = &font_ui; if (pf->fd >= 0 && pf == &font_ui) { - char path[MAX_PATH]; - const char *file = get_user_file_path(GLYPH_CACHE_FILE, IS_FILE|NEED_WRITE, - path, sizeof(path)); - - cache_fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, 0666); + cache_fd = open(GLYPH_CACHE_FILE, O_WRONLY|O_CREAT|O_TRUNC, 0666); if (cache_fd < 0) return; @@ -678,7 +674,6 @@ static void glyph_cache_load(struct font* pf) int i, size; unsigned char tmp[2]; unsigned short ch; - char path[MAX_PATH]; unsigned short glyphs[MAX_SORT]; unsigned short glyphs_lru_order[MAX_SORT]; int glyph_file_skip=0, glyph_file_size=0; @@ -687,8 +682,7 @@ static void glyph_cache_load(struct font* pf) if ( sort_size > MAX_SORT ) sort_size = MAX_SORT; - fd = open(get_user_file_path(GLYPH_CACHE_FILE, IS_FILE|NEED_WRITE, - path, sizeof(path)), O_RDONLY|O_BINARY); + fd = open(GLYPH_CACHE_FILE, O_RDONLY|O_BINARY); if (fd >= 0) { /* only read what fits */ -- cgit v1.2.3