Commit 984211fb authored by hpi1's avatar hpi1

Avoid shadowing variables. Added warning -Wshadow.

parent 22b453fd
......@@ -199,6 +199,8 @@ check_cc_options -Wundef && \
SET_WARNINGS="$SET_WARNINGS -Wundef"
check_cc_options -Wmissing-prototypes && \
SET_WARNINGS="$SET_WARNINGS -Wmissing-prototypes"
check_cc_options -Wshadow && \
SET_WARNINGS="$SET_WARNINGS -Wshadow"
# no implicit function declarations
check_cc_options -Werror-implicit-function-declaration && \
......
......@@ -791,13 +791,13 @@ NAV_CLIP* nav_set_angle(NAV_TITLE *title, NAV_CLIP *clip, unsigned angle)
title->packets = 0;
for (ii = 0; ii < title->pl->list_count; ii++) {
MPLS_PI *pi;
NAV_CLIP *clip;
NAV_CLIP *cl;
pi = &title->pl->play_item[ii];
clip = &title->clip_list.clip[ii];
cl = &title->clip_list.clip[ii];
_fill_clip(title, pi->clip, pi->connection_condition, pi->in_time, pi->out_time, pi->angle_count,
clip, ii, &pos, &time);
cl, ii, &pos, &time);
}
_extrapolate_title(title);
return clip;
......
......@@ -925,9 +925,9 @@ static int _user_input(GRAPHICS_CONTROLLER *gc, uint32_t key, GC_NAV_CMDS *cmds)
}
if (new_btn_id != cur_btn_id) {
BD_IG_BUTTON *button = _find_button_page(page, new_btn_id, NULL);
if (button) {
cmds->sound_id_ref = button->selected_sound_id_ref;
BD_IG_BUTTON *new_button = _find_button_page(page, new_btn_id, NULL);
if (new_button) {
cmds->sound_id_ref = new_button->selected_sound_id_ref;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment