aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Grebowiec <njgreb@gmail.com>2013-12-22 23:15:08 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-12-22 23:15:08 +0000
commit1cc726c4c81995ee08310a7808ccb5517cef565c (patch)
treee5a817bcbccb6f130a913a81d5dfee391eb17c75
parent6b251e4d806de7fbb86cee5b5fe4626f08a78e0c (diff)
parentd98fabe2aa8df0e421a69130c1d787705209682d (diff)
downloadandroid_bootable_recovery-1cc726c4c81995ee08310a7808ccb5517cef565c.tar.gz
android_bootable_recovery-1cc726c4c81995ee08310a7808ccb5517cef565c.tar.bz2
android_bootable_recovery-1cc726c4c81995ee08310a7808ccb5517cef565c.zip
Merge "remove useless code" into cm-10.2
-rw-r--r--extendedcommands.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/extendedcommands.c b/extendedcommands.c
index 3821f603..a996d0fb 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -1233,10 +1233,10 @@ void format_sdcard(const char* volume) {
if (is_data_media_volume_path(volume))
return;
- Volume *vol = volume_for_path(volume);
- if (vol == NULL || strcmp(vol->fs_type, "auto") != 0)
+ Volume *v = volume_for_path(volume);
+ if (v == NULL || strcmp(v->fs_type, "auto") != 0)
return;
- if (!fs_mgr_is_voldmanaged(vol) && !can_partition(volume))
+ if (!fs_mgr_is_voldmanaged(v) && !can_partition(volume))
return;
char* headers[] = {"Format device:", volume, "", NULL };
@@ -1259,7 +1259,6 @@ void format_sdcard(const char* volume) {
if (!confirm_selection( "Confirm formatting?", "Yes - Format device"))
return;
- Volume *v = volume_for_path(volume);
if (ensure_path_unmounted(v->mount_point) != 0)
return;