diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-14 04:42:03 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-14 04:42:03 +0000 |
| commit | 404c6bba9c5295e9b75716678b602ef8e460f352 (patch) | |
| tree | 3c3a961ac032e90961fff30bb7ce62050594dcac | |
| parent | d991a289bbbb573630c678936d183f608bff7fc2 (diff) | |
disktidy: don't use "abort" for variable name as it might conflict
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31240 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/disktidy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index f3717fd47c..621238acfb 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c @@ -23,7 +23,7 @@ static int removed = 0; /* number of items removed */ -static bool abort; +static bool user_abort; struct tidy_type { 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) { rb->closedir(dir); - abort = true; + user_abort = true; return PLUGIN_OK; } if (rb->default_event_handler(button) == SYS_USB_CONNECTED) @@ -288,7 +288,7 @@ static enum plugin_status tidy_do(void) if (status == PLUGIN_OK) { rb->lcd_clear_display(); - if (abort) + if (user_abort) { rb->splash(HZ, "User aborted"); rb->lcd_clear_display(); @@ -361,7 +361,7 @@ static void tidy_lcd_menu(void) switch(rb->do_menu(&menu, &selection, NULL, false)) { default: - abort = true; + user_abort = true; case 0: return; /* start cleaning */ @@ -409,5 +409,5 @@ enum plugin_status plugin_start(const void* parameter) if (tidy_loaded_and_changed) save_config(); - return abort ? PLUGIN_OK : tidy_do(); + return user_abort ? PLUGIN_OK : tidy_do(); } |