diff options
| author | Doug Zongker <dougz@android.com> | 2010-08-13 09:59:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-13 09:59:52 -0700 |
| commit | fbd7ae7a1ce0060221241ed02c576983c1f48d34 (patch) | |
| tree | 1580e8bafbe8a12d59820ef1b591b05bc093cf0b | |
| parent | 17986e6b8766ef9bdaa49efc7099e3867ca1978a (diff) | |
| parent | 201cd46680f5789e21a57fb4476ab0ba0c0ed4c0 (diff) | |
| download | bootable_recovery-fbd7ae7a1ce0060221241ed02c576983c1f48d34.zip bootable_recovery-fbd7ae7a1ce0060221241ed02c576983c1f48d34.tar.gz bootable_recovery-fbd7ae7a1ce0060221241ed02c576983c1f48d34.tar.bz2 | |
am 201cd466: remove shadowed variable declaration
Merge commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0' into gingerbread
* commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0':
remove shadowed variable declaration
| -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); |