devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

disktidy: don't use "abort" for variable name as it might conflict

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31240 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2011-12-14 04:42:03 +00:00
parent d991a289bb
commit 404c6bba9c
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/plugins/disktidy.c
View file

@ -23,7 +23,7 @@
static int removed = 0; /* number of items removed */ static int removed = 0; /* number of items removed */
static bool abort; static bool user_abort;
struct tidy_type { struct tidy_type {
char filestring[64]; char filestring[64];
@ -223,7 +223,7 @@ static enum plugin_status tidy_clean(char *path, int *path_length, bool rmdir)
if (button == ACTION_STD_CANCEL) if (button == ACTION_STD_CANCEL)
{ {
rb->closedir(dir); rb->closedir(dir);
abort = true; user_abort = true;
return PLUGIN_OK; return PLUGIN_OK;
} }
if (rb->default_event_handler(button) == SYS_USB_CONNECTED) if (rb->default_event_handler(button) == SYS_USB_CONNECTED)
@ -288,7 +288,7 @@ static enum plugin_status tidy_do(void)
if (status == PLUGIN_OK) if (status == PLUGIN_OK)
{ {
rb->lcd_clear_display(); rb->lcd_clear_display();
if (abort) if (user_abort)
{ {
rb->splash(HZ, "User aborted"); rb->splash(HZ, "User aborted");
rb->lcd_clear_display(); rb->lcd_clear_display();
@ -361,7 +361,7 @@ static void tidy_lcd_menu(void)
switch(rb->do_menu(&menu, &selection, NULL, false)) switch(rb->do_menu(&menu, &selection, NULL, false))
{ {
default: default:
abort = true; user_abort = true;
case 0: case 0:
return; /* start cleaning */ return; /* start cleaning */
@ -409,5 +409,5 @@ enum plugin_status plugin_start(const void* parameter)
if (tidy_loaded_and_changed) if (tidy_loaded_and_changed)
save_config(); save_config();
return abort ? PLUGIN_OK : tidy_do(); return user_abort ? PLUGIN_OK : tidy_do();
} }