diff options
author | Doug Zongker <dougz@android.com> | 2010-08-13 10:02:51 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-13 10:02:51 -0700 |
commit | c080bc549aaf272c77fe7903e52c2a2c0d8de1bb (patch) | |
tree | 1580e8bafbe8a12d59820ef1b591b05bc093cf0b /applypatch | |
parent | c4e3200578ad670bee9f5a88e90e7a77089d5df7 (diff) | |
parent | fbd7ae7a1ce0060221241ed02c576983c1f48d34 (diff) | |
download | bootable_recovery-c080bc549aaf272c77fe7903e52c2a2c0d8de1bb.zip bootable_recovery-c080bc549aaf272c77fe7903e52c2a2c0d8de1bb.tar.gz bootable_recovery-c080bc549aaf272c77fe7903e52c2a2c0d8de1bb.tar.bz2 |
am fbd7ae7a: am 201cd466: remove shadowed variable declaration
Merge commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34' into gingerbread-plus-aosp
* commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34':
remove shadowed variable declaration
Diffstat (limited to 'applypatch')
-rw-r--r-- | applypatch/applypatch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/applypatch/applypatch.c b/applypatch/applypatch.c index 5debaac..b85b915 100644 --- a/applypatch/applypatch.c +++ b/applypatch/applypatch.c @@ -645,7 +645,8 @@ int applypatch(const char* source_filename, int enough_space = 0; if (retry > 0) { size_t free_space = FreeSpaceForFile(target_fs); - int enough_space = + enough_space = + (free_space > (256 << 10)) && // 256k (two-block) minimum (free_space > (target_size * 3 / 2)); // 50% margin of error printf("target %ld bytes; free space %ld bytes; retry %d; enough %d\n", (long)target_size, (long)free_space, retry, enough_space); |