diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-12-23 19:37:42 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-12-23 19:59:06 +0000 |
commit | 5f2ca6718dadd29ce1ddc723153bbb07cc41d68e (patch) | |
tree | 79ed4e6c1b991d2646721e0d7d94c20280a16586 /firmware/buflib.c | |
parent | ba010851fafea3da0d0655b103158f0a9efe6406 (diff) | |
download | rockbox-5f2ca6718dadd29ce1ddc723153bbb07cc41d68e.tar.gz rockbox-5f2ca6718dadd29ce1ddc723153bbb07cc41d68e.zip |
Revert "buflib.c strip path from alloc name"
The font code expects the full path to be stored in the
buflib alloc so this breaks eg. saving the glyph cache.
This reverts commit 2b4a4070c99439898e22c9c9da2c21877d18a367.
Change-Id: I53844c39b34b14f7c8e5999825c1d012fa3f74dc
Diffstat (limited to 'firmware/buflib.c')
-rw-r--r-- | firmware/buflib.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/buflib.c b/firmware/buflib.c index d9f82f8854..2ce9cc344c 100644 --- a/firmware/buflib.c +++ b/firmware/buflib.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include "panic.h" | 35 | #include "panic.h" |
36 | #include "crc32.h" | 36 | #include "crc32.h" |
37 | #include "system.h" /* for ALIGN_*() */ | 37 | #include "system.h" /* for ALIGN_*() */ |
38 | #include "pathfuncs.h" /* path_basename() */ | ||
39 | 38 | ||
40 | /* The main goal of this design is fast fetching of the pointer for a handle. | 39 | /* The main goal of this design is fast fetching of the pointer for a handle. |
41 | * For that reason, the handles are stored in a table at the end of the buffer | 40 | * For that reason, the handles are stored in a table at the end of the buffer |
@@ -659,9 +658,6 @@ int | |||
659 | buflib_alloc_ex(struct buflib_context *ctx, size_t size, const char *name, | 658 | buflib_alloc_ex(struct buflib_context *ctx, size_t size, const char *name, |
660 | struct buflib_callbacks *ops) | 659 | struct buflib_callbacks *ops) |
661 | { | 660 | { |
662 | if (name) /* if name is a path strip everything but the filename */ | ||
663 | path_basename(name, &name); | ||
664 | |||
665 | union buflib_data *handle, *block; | 661 | union buflib_data *handle, *block; |
666 | size_t name_len = name ? B_ALIGN_UP(strlen(name)+1) : 0; | 662 | size_t name_len = name ? B_ALIGN_UP(strlen(name)+1) : 0; |
667 | bool last; | 663 | bool last; |