summaryrefslogtreecommitdiffstats
path: root/firmware/font.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-12-06 22:26:31 +0000
committerThomas Martitz <kugel@rockbox.org>2010-12-06 22:26:31 +0000
commit2c2416094f426972c9e2e96d25058311bbe82f97 (patch)
tree449b4e12e01c3c5c4afa2ae6a8cd396df82b5a38 /firmware/font.c
parentc35b43b0f54bd607d38908544446caaa02f148a3 (diff)
downloadrockbox-2c2416094f426972c9e2e96d25058311bbe82f97.tar.gz
rockbox-2c2416094f426972c9e2e96d25058311bbe82f97.tar.bz2
rockbox-2c2416094f426972c9e2e96d25058311bbe82f97.zip
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
Diffstat (limited to 'firmware/font.c')
-rw-r--r--firmware/font.c10
1 files changed, 2 insertions, 8 deletions
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 */