len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tree.c small cleanup no functional changes

Browse source 
Change-Id: Icb165ed94f8e1a165f285c7482c46d6e74846d10
This commit is contained in:
William Wilgus 2025-02-12 03:44:42 -05:00
parent ef03dde011
commit fb96ae2cc9
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/tree.c
View file

@ -112,7 +112,7 @@ struct entry* tree_get_entry_at(struct tree_context *t, int index)
return &entries[index]; return &entries[index];
} }
static struct entry *tree_get_valid_entry_at(const char* funcname, static struct entry *get_valid_entry(const char* funcname,
struct tree_context *t, int index) struct tree_context *t, int index)
{ {
struct entry *entry = tree_get_entry_at(t, index); struct entry *entry = tree_get_entry_at(t, index);
@ -163,8 +163,7 @@ static const char* tree_get_filename(int selected_item, void *data,
else else
#endif #endif
{ {
struct entry *entry = struct entry *entry = get_valid_entry(__func__, local_tc, selected_item);
tree_get_valid_entry_at(__func__, local_tc, selected_item);
name = entry->name; name = entry->name;
attr = entry->attr; attr = entry->attr;
} }
@ -182,8 +181,7 @@ static int tree_get_filecolor(int selected_item, void * data)
if (*tc.dirfilter == SHOW_ID3DB) if (*tc.dirfilter == SHOW_ID3DB)
return -1; return -1;
struct tree_context * local_tc=(struct tree_context *)data; struct tree_context * local_tc=(struct tree_context *)data;
struct entry *entry = struct entry *entry = get_valid_entry(__func__, local_tc, selected_item);
tree_get_valid_entry_at(__func__, local_tc, selected_item);
return filetype_get_color(entry->name, entry->attr); return filetype_get_color(entry->name, entry->attr);
} }
@ -200,8 +198,7 @@ static enum themable_icons tree_get_fileicon(int selected_item, void * data)
else else
#endif #endif
{ {
struct entry *entry = struct entry *entry = get_valid_entry(__func__, local_tc, selected_item);
tree_get_valid_entry_at(__func__, local_tc, selected_item);
return filetype_get_icon(entry->attr); return filetype_get_icon(entry->attr);
} }
@ -251,8 +248,7 @@ static int tree_voice_cb(int selected_item, void * data)
else else
#endif #endif
{ {
struct entry *entry = struct entry *entry = get_valid_entry(__func__, local_tc, selected_item);
tree_get_valid_entry_at(__func__, local_tc, selected_item);
name = entry->name; name = entry->name;
attr = entry->attr; attr = entry->attr;
} }
@ -484,7 +480,7 @@ static int update_dir(void)
if (tc.dirlevel > 0 && *tc.dirfilter == SHOW_PLUGINS) if (tc.dirlevel > 0 && *tc.dirfilter == SHOW_PLUGINS)
{ {
char *subdir = strrchr(tc.currdir, '/'); char *subdir = strrchr(tc.currdir, '/');
if (subdir) if (subdir != NULL)
title = subdir + 1; /* step past the separator */ title = subdir + 1; /* step past the separator */
} }
} }
@ -782,7 +778,7 @@ static int dirbrowse(void)
if (tc.browse->flags & BROWSE_SELECTONLY) if (tc.browse->flags & BROWSE_SELECTONLY)
{ {
struct entry *entry = struct entry *entry =
tree_get_valid_entry_at(__func__, &tc, tc.selected_item); get_valid_entry(__func__, &tc, tc.selected_item);
short attr = entry->attr; short attr = entry->attr;
if(!(attr & ATTR_DIRECTORY)) if(!(attr & ATTR_DIRECTORY))
{ {
@ -932,7 +928,7 @@ static int dirbrowse(void)
#endif #endif
{ {
struct entry *entry = struct entry *entry =
tree_get_valid_entry_at(__func__, &tc, tc.selected_item); get_valid_entry(__func__, &tc, tc.selected_item);
attr = entry->attr; attr = entry->attr;