summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-04-26 18:56:44 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-04-26 18:56:44 +0200
commit22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88 (patch)
treed1822b36cf560fe072129f09172df3083d067ad0
parentMerge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." (diff)
parentMerge "applypatch: Remove the obsolete support for "applypatch -s"." (diff)
downloadandroid_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.tar
android_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.tar.gz
android_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.tar.bz2
android_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.tar.lz
android_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.tar.xz
android_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.tar.zst
android_bootable_recovery-22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88.zip
-rw-r--r--applypatch/applypatch_modes.cpp18
-rw-r--r--tests/component/applypatch_test.cpp14
2 files changed, 1 insertions, 31 deletions
diff --git a/applypatch/applypatch_modes.cpp b/applypatch/applypatch_modes.cpp
index 7b191a801..aa32d57ef 100644
--- a/applypatch/applypatch_modes.cpp
+++ b/applypatch/applypatch_modes.cpp
@@ -44,19 +44,6 @@ static int CheckMode(int argc, const char** argv) {
return applypatch_check(argv[2], sha1);
}
-static int SpaceMode(int argc, const char** argv) {
- if (argc != 3) {
- return 2;
- }
-
- size_t bytes;
- if (!android::base::ParseUint(argv[2], &bytes) || bytes == 0) {
- printf("can't parse \"%s\" as byte count\n\n", argv[2]);
- return 1;
- }
- return CacheSizeCheck(bytes);
-}
-
// Parse arguments (which should be of the form "<sha1>:<filename>" into the
// new parallel arrays *sha1s and *files. Returns true on success.
static bool ParsePatchArgs(int argc, const char** argv, std::vector<std::string>* sha1s,
@@ -175,13 +162,12 @@ int applypatch_modes(int argc, const char** argv) {
"usage: %s [-b <bonus-file>] <src-file> <tgt-file> <tgt-sha1> <tgt-size> "
"[<src-sha1>:<patch> ...]\n"
" or %s -c <file> [<sha1> ...]\n"
- " or %s -s <bytes>\n"
" or %s -l\n"
"\n"
"Filenames may be of the form\n"
" EMMC:<partition>:<len_1>:<sha1_1>:<len_2>:<sha1_2>:...\n"
"to specify reading from or writing to an EMMC partition.\n\n",
- argv[0], argv[0], argv[0], argv[0]);
+ argv[0], argv[0], argv[0]);
return 2;
}
@@ -191,8 +177,6 @@ int applypatch_modes(int argc, const char** argv) {
result = ShowLicenses();
} else if (strncmp(argv[1], "-c", 3) == 0) {
result = CheckMode(argc, argv);
- } else if (strncmp(argv[1], "-s", 3) == 0) {
- result = SpaceMode(argc, argv);
} else {
result = PatchMode(argc, argv);
}
diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index 6fdf78e47..016fed9b1 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -377,20 +377,6 @@ TEST(ApplyPatchModesTest, CheckModeInvalidArgs) {
ASSERT_EQ(2, applypatch_modes(2, (const char* []){ "applypatch", "-c" }));
}
-TEST(ApplyPatchModesTest, SpaceModeInvalidArgs) {
- // Insufficient args.
- ASSERT_EQ(2, applypatch_modes(2, (const char* []){ "applypatch", "-s" }));
-
- // Invalid bytes arg.
- ASSERT_EQ(1, applypatch_modes(3, (const char* []){ "applypatch", "-s", "x" }));
-
- // 0 is invalid.
- ASSERT_EQ(1, applypatch_modes(3, (const char* []){ "applypatch", "-s", "0" }));
-
- // 0x10 is fine.
- ASSERT_EQ(0, applypatch_modes(3, (const char* []){ "applypatch", "-s", "0x10" }));
-}
-
TEST(ApplyPatchModesTest, ShowLicenses) {
ASSERT_EQ(0, applypatch_modes(2, (const char* []){ "applypatch", "-l" }));
}