A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

Remove some shadowed variables identified by -Wshadow

there are plenty more but these are the low hanging fruit

Change-Id: I86d9f4f56e8cd9b381d1bf6a6679cd58c6a4004d

authored by

William Wilgus and committed by
William Wilgus
034b6d5b f94a14b8

+12 -15
+1 -1
apps/cuesheet.c
··· 65 65 strcpy(cuepath, CUE_DIR); 66 66 if (strlcat(cuepath, slash, MAX_PATH) >= MAX_PATH) 67 67 goto skip; /* overflow */ 68 - char *dot = strrchr(cuepath, '.'); 68 + dot = strrchr(cuepath, '.'); 69 69 strcpy(dot, ".cue"); 70 70 if (!file_exists(cuepath)) 71 71 {
+1 -1
apps/filetree.c
··· 667 667 break; 668 668 } 669 669 670 - struct entry* file = tree_get_entry_at(c, c->selected_item); 670 + file = tree_get_entry_at(c, c->selected_item); 671 671 if (!file) 672 672 { 673 673 splashf(HZ, str(LANG_READ_FAILED), str(LANG_UNKNOWN));
+1 -1
apps/gui/folder_select.c
··· 208 208 if ((dn[0] == '.') && (dn[1] == '\0' || (dn[1] == '.' && dn[2] == '\0'))) 209 209 continue; 210 210 /* copy entry name to end of buffer, save pointer */ 211 - int len = strlen((char *)entry->d_name); 211 + len = strlen((char *)entry->d_name); 212 212 char *name = folder_alloc_from_end(len+1); /*for NULL*/ 213 213 if (name == NULL) 214 214 {
-1
apps/menu.c
··· 522 522 MENUITEM_STRINGLIST(notquickscreen_able_option, 523 523 ID2P(LANG_ONPLAY_MENU_TITLE), NULL, 524 524 ID2P(LANG_RESET_SETTING)); 525 - const struct menu_item_ex *menu; 526 525 const struct settings_list *setting = 527 526 find_setting(temp->variable, NULL); 528 527 #ifdef HAVE_QUICKSCREEN
+1 -1
apps/recorder/keyboard.c
··· 549 549 { 550 550 /* declare scoped pointers inside screen loops - hide the 551 551 declarations from previous block level */ 552 - struct keyboard_parameters *pm = &param[l]; 553 552 struct screen *sc = &screens[l]; 553 + pm = &param[l]; 554 554 sc->clear_display(); 555 555 kbd_draw_picker(pm, sc, &state); 556 556 kbd_draw_edit_line(pm, sc, &state);
+1 -1
apps/tagcache.c
··· 4333 4333 unsigned int searchflag = auto_update ? DCS_STORAGE_PATH : 4334 4334 DCS_CACHED_PATH; 4335 4335 4336 - int rc = dircache_search(searchflag | DCS_UPDATE_FILEREF, 4336 + rc = dircache_search(searchflag | DCS_UPDATE_FILEREF, 4337 4337 &tcrc_dcfrefs[idx_id], filename); 4338 4338 if (rc > 0) /* in cache and we have fileref */ 4339 4339 idx->flag |= FLAG_DIRCACHE;
+4 -4
apps/tagtree.c
··· 215 215 /* loop over menus */ 216 216 for(int i = 0; i < menu_count; i++) 217 217 { 218 - struct menu_root* menu = menus[i]; 218 + struct menu_root* menuroot = menus[i]; 219 219 /* then over the menu_entries of a menu */ 220 - for(int j = 0; j < menu->itemcount; j++) 220 + for(int j = 0; j < menuroot->itemcount; j++) 221 221 { 222 - struct menu_entry* mentry = menu->items[j]; 222 + struct menu_entry* mentry = menuroot->items[j]; 223 223 /* then over the search_instructions of each menu_entry */ 224 224 for(int k = 0; k < mentry->si.tagorder_count; k++) 225 225 { ··· 230 230 UPDATE(mentry->si.clause[k][l], diff); 231 231 } 232 232 } 233 - UPDATE(menu->items[j], diff); 233 + UPDATE(menuroot->items[j], diff); 234 234 } 235 235 UPDATE(menus[i], diff); 236 236 }
+1 -1
apps/talk.c
··· 987 987 return -1; 988 988 if (talk_handle <= 0 || index_handle <= 0) 989 989 { 990 - int fd = open_voicefile(); 990 + fd = open_voicefile(); 991 991 if (fd < 0 || !load_voicefile_index(fd)) 992 992 return load_voicefile_failure(fd); 993 993 load_voicefile_data(fd);
+2 -4
firmware/drivers/lcd-color-common.c
··· 242 242 int x, int y, int width, int height) 243 243 { 244 244 const unsigned char *ysrc, *usrc, *vsrc; 245 + int cb, cr, rv, guv, bu, r, g, b; 246 + 245 247 int linecounter; 246 248 fb_data *dst, *row_end; 247 249 long z; ··· 272 274 { 273 275 do 274 276 { 275 - int y, cb, cr, rv, guv, bu, r, g, b; 276 - 277 277 y = YFAC*(*ysrc++ - 16); 278 278 cb = *usrc++ - 128; 279 279 cr = *vsrc++ - 128; ··· 337 337 338 338 do 339 339 { 340 - int y, cb, cr, rv, guv, bu, r, g, b; 341 - 342 340 y = YFAC*(*ysrc++ - 16); 343 341 cb = *usrc++ - 128; 344 342 cr = *vsrc++ - 128;