summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2012-05-06 23:10:19 -0400
committerRafaël Carré <funman@videolan.org>2012-05-06 23:13:34 -0400
commit65bb8e4452575164a36fbd503bb3d23f7061b9d1 (patch)
tree8f7769fa6cf19cdf568c808e01844482cb9c666c
parentaaf9a1be494812dd6aedde12ea7b3c2d3305d6b7 (diff)
downloadrockbox-65bb8e4452575164a36fbd503bb3d23f7061b9d1.tar.gz
rockbox-65bb8e4452575164a36fbd503bb3d23f7061b9d1.zip
Remove extraneous parens
-rw-r--r--apps/gui/wps.c2
-rw-r--r--apps/menu.c2
-rw-r--r--apps/menus/main_menu.c2
-rw-r--r--firmware/drivers/fat.c4
-rw-r--r--firmware/target/arm/philips/hdd6330/button-hdd6330.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 88918e16d3..25c97fe613 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -592,7 +592,7 @@ static void play_hop(int direction)
592#endif 592#endif
593 return; 593 return;
594 } 594 }
595 else if ((direction == -1 && elapsed < step)) 595 else if (direction == -1 && elapsed < step)
596 { 596 {
597 elapsed = 0; 597 elapsed = 0;
598 } 598 }
diff --git a/apps/menu.c b/apps/menu.c
index b813f03dce..7ab7b56152 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -459,7 +459,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
459 selected = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu); 459 selected = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu);
460 temp = menu->submenus[selected]; 460 temp = menu->submenus[selected];
461 type = (temp->flags&MENU_TYPE_MASK); 461 type = (temp->flags&MENU_TYPE_MASK);
462 if ((type == MT_SETTING_W_TEXT || type == MT_SETTING)) 462 if (type == MT_SETTING_W_TEXT || type == MT_SETTING)
463 { 463 {
464#ifdef HAVE_QUICKSCREEN 464#ifdef HAVE_QUICKSCREEN
465 MENUITEM_STRINGLIST(quickscreen_able_option, 465 MENUITEM_STRINGLIST(quickscreen_able_option,
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index b7472a6849..f4b754364b 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -333,7 +333,7 @@ static int info_action_callback(int action, struct gui_synclist *lists)
333{ 333{
334 if (action == ACTION_STD_CANCEL) 334 if (action == ACTION_STD_CANCEL)
335 return action; 335 return action;
336 else if ((action == ACTION_STD_OK) 336 else if (action == ACTION_STD_OK
337#ifdef HAVE_HOTSWAP 337#ifdef HAVE_HOTSWAP
338 || action == SYS_FS_CHANGED 338 || action == SYS_FS_CHANGED
339#endif 339#endif
diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c
index f76b10c078..51b0cba372 100644
--- a/firmware/drivers/fat.c
+++ b/firmware/drivers/fat.c
@@ -1596,9 +1596,9 @@ static void randomize_dos_name(unsigned char *name)
1596 while(i++ < 8) 1596 while(i++ < 8)
1597 { 1597 {
1598 /* hunt for ~ and where to put it */ 1598 /* hunt for ~ and where to put it */
1599 if((!tilde) && (*nameptr == '~')) 1599 if(!tilde && *nameptr == '~')
1600 tilde = nameptr; 1600 tilde = nameptr;
1601 if((!lastpt) && ((*nameptr == ' ' || *nameptr == '~'))) 1601 if(!lastpt && (*nameptr == ' ' || *nameptr == '~'))
1602 lastpt = nameptr; 1602 lastpt = nameptr;
1603 nameptr++; 1603 nameptr++;
1604 } 1604 }
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
index 924069bcbd..75e14e375f 100644
--- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
@@ -82,7 +82,7 @@ void button_int(void)
82 { 82 {
83 int_btn |= BUTTON_TAP; 83 int_btn |= BUTTON_TAP;
84 } 84 }
85 else if ((data[0] == MEP_ABSOLUTE_HEADER)) 85 else if (data[0] == MEP_ABSOLUTE_HEADER)
86 { 86 {
87 if (data[1] & MEP_FINGER) 87 if (data[1] & MEP_FINGER)
88 { 88 {