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) | |
download | rockbox-404c6bba9c5295e9b75716678b602ef8e460f352.tar.gz rockbox-404c6bba9c5295e9b75716678b602ef8e460f352.zip |
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 @@ | |||
23 | 23 | ||
24 | 24 | ||
25 | static int removed = 0; /* number of items removed */ | 25 | static int removed = 0; /* number of items removed */ |
26 | static bool abort; | 26 | static bool user_abort; |
27 | 27 | ||
28 | struct tidy_type { | 28 | struct tidy_type { |
29 | char filestring[64]; | 29 | char filestring[64]; |
@@ -223,7 +223,7 @@ static enum plugin_status tidy_clean(char *path, int *path_length, bool rmdir) | |||
223 | if (button == ACTION_STD_CANCEL) | 223 | if (button == ACTION_STD_CANCEL) |
224 | { | 224 | { |
225 | rb->closedir(dir); | 225 | rb->closedir(dir); |
226 | abort = true; | 226 | user_abort = true; |
227 | return PLUGIN_OK; | 227 | return PLUGIN_OK; |
228 | } | 228 | } |
229 | if (rb->default_event_handler(button) == SYS_USB_CONNECTED) | 229 | if (rb->default_event_handler(button) == SYS_USB_CONNECTED) |
@@ -288,7 +288,7 @@ static enum plugin_status tidy_do(void) | |||
288 | if (status == PLUGIN_OK) | 288 | if (status == PLUGIN_OK) |
289 | { | 289 | { |
290 | rb->lcd_clear_display(); | 290 | rb->lcd_clear_display(); |
291 | if (abort) | 291 | if (user_abort) |
292 | { | 292 | { |
293 | rb->splash(HZ, "User aborted"); | 293 | rb->splash(HZ, "User aborted"); |
294 | rb->lcd_clear_display(); | 294 | rb->lcd_clear_display(); |
@@ -361,7 +361,7 @@ static void tidy_lcd_menu(void) | |||
361 | switch(rb->do_menu(&menu, &selection, NULL, false)) | 361 | switch(rb->do_menu(&menu, &selection, NULL, false)) |
362 | { | 362 | { |
363 | default: | 363 | default: |
364 | abort = true; | 364 | user_abort = true; |
365 | case 0: | 365 | case 0: |
366 | return; /* start cleaning */ | 366 | return; /* start cleaning */ |
367 | 367 | ||
@@ -409,5 +409,5 @@ enum plugin_status plugin_start(const void* parameter) | |||
409 | if (tidy_loaded_and_changed) | 409 | if (tidy_loaded_and_changed) |
410 | save_config(); | 410 | save_config(); |
411 | 411 | ||
412 | return abort ? PLUGIN_OK : tidy_do(); | 412 | return user_abort ? PLUGIN_OK : tidy_do(); |
413 | } | 413 | } |