Skip to content

Commit 21470a3

Browse files
committed
menu_cbs_label improvements:
1. Bugfix: Final return -1 → return 0 so the function no longer reports failure after successfully binding a label. 2. Consolidated fallthroughs: PLAYLIST_MANAGER_SETTINGS and CONTENT_SETTINGS now fall through with the other playlist cases instead of having duplicate bind+break blocks. 3. Early-out restructure: Inverted the enum_idx != MSG_UNKNOWN check to an early return 0, reducing nesting by one level.
1 parent 3c147cd commit 21470a3

1 file changed

Lines changed: 35 additions & 39 deletions

File tree

menu/cbs/menu_cbs_label.c

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -108,48 +108,44 @@ int menu_cbs_init_bind_label(menu_file_list_cbs_t *cbs,
108108

109109
BIND_ACTION_LABEL(cbs, action_bind_label_generic);
110110

111-
if (cbs->enum_idx != MSG_UNKNOWN)
111+
if (cbs->enum_idx == MSG_UNKNOWN)
112+
return 0;
113+
114+
switch (cbs->enum_idx)
112115
{
113-
switch (cbs->enum_idx)
114-
{
115-
case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY:
116-
case MENU_ENUM_LABEL_GOTO_FAVORITES:
117-
case MENU_ENUM_LABEL_GOTO_IMAGES:
118-
case MENU_ENUM_LABEL_GOTO_MUSIC:
119-
case MENU_ENUM_LABEL_GOTO_VIDEO:
120-
case MENU_ENUM_LABEL_PLAYLIST_COLLECTION_ENTRY:
121-
BIND_ACTION_LABEL(cbs, action_bind_label_playlist_collection_entry);
122-
break;
123-
case MENU_ENUM_LABEL_PLAYLIST_MANAGER_SETTINGS:
124-
BIND_ACTION_LABEL(cbs, action_bind_label_playlist_collection_entry);
125-
break;
126-
case MENU_ENUM_LABEL_CONTENT_SETTINGS:
127-
BIND_ACTION_LABEL(cbs, action_bind_label_playlist_collection_entry);
128-
break;
129-
case MENU_ENUM_LABEL_CHEAT_BROWSE_MEMORY:
116+
case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY:
117+
case MENU_ENUM_LABEL_GOTO_FAVORITES:
118+
case MENU_ENUM_LABEL_GOTO_IMAGES:
119+
case MENU_ENUM_LABEL_GOTO_MUSIC:
120+
case MENU_ENUM_LABEL_GOTO_VIDEO:
121+
case MENU_ENUM_LABEL_PLAYLIST_COLLECTION_ENTRY:
122+
case MENU_ENUM_LABEL_PLAYLIST_MANAGER_SETTINGS:
123+
case MENU_ENUM_LABEL_CONTENT_SETTINGS:
124+
BIND_ACTION_LABEL(cbs, action_bind_label_playlist_collection_entry);
125+
break;
126+
case MENU_ENUM_LABEL_CHEAT_BROWSE_MEMORY:
130127
#ifdef HAVE_CHEATS
131-
BIND_ACTION_LABEL(cbs, action_bind_label_cheat_browse_address);
128+
BIND_ACTION_LABEL(cbs, action_bind_label_cheat_browse_address);
132129
#endif
133-
break;
134-
case MSG_INTERNAL_STORAGE:
135-
BIND_ACTION_LABEL(cbs, action_bind_label_internal_memory);
136-
break;
137-
case MSG_REMOVABLE_STORAGE:
138-
BIND_ACTION_LABEL(cbs, action_bind_label_removable_storage);
139-
break;
140-
case MSG_APPLICATION_DIR:
141-
BIND_ACTION_LABEL(cbs, action_bind_label_application_dir);
142-
break;
143-
case MSG_EXTERNAL_APPLICATION_DIR:
144-
BIND_ACTION_LABEL(cbs, action_bind_label_external_application_dir);
145-
break;
146-
case MENU_ENUM_LABEL_RDB_ENTRY_DETAIL:
147-
BIND_ACTION_LABEL(cbs, action_bind_label_rdb_entry_detail);
148-
break;
149-
default:
150-
break;
151-
}
130+
break;
131+
case MSG_INTERNAL_STORAGE:
132+
BIND_ACTION_LABEL(cbs, action_bind_label_internal_memory);
133+
break;
134+
case MSG_REMOVABLE_STORAGE:
135+
BIND_ACTION_LABEL(cbs, action_bind_label_removable_storage);
136+
break;
137+
case MSG_APPLICATION_DIR:
138+
BIND_ACTION_LABEL(cbs, action_bind_label_application_dir);
139+
break;
140+
case MSG_EXTERNAL_APPLICATION_DIR:
141+
BIND_ACTION_LABEL(cbs, action_bind_label_external_application_dir);
142+
break;
143+
case MENU_ENUM_LABEL_RDB_ENTRY_DETAIL:
144+
BIND_ACTION_LABEL(cbs, action_bind_label_rdb_entry_detail);
145+
break;
146+
default:
147+
break;
152148
}
153149

154-
return -1;
150+
return 0;
155151
}

0 commit comments

Comments
 (0)