Merge "remount: Remove unused option -C/--clean_scratch_files" (4284589b) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_remount.cpp

+6 −10

Original line number	Diff line number	Diff line
		@@ -475,16 +475,15 @@ static int do_remount(Fstab& fstab, const std::vector<std::string>& partition_ar
		return retval;
		}

		static int do_clean_scratch_files() {
		int main(int argc, char* argv[]) {
		// Do not use MyLogger() when running as clean_scratch_files, as stdout/stderr of daemon process
		// are discarded.
		if (argc > 0 && android::base::Basename(argv[0]) == "clean_scratch_files"s) {
		android::fs_mgr::CleanupOldScratchFiles();
		return 0;
		}

		int main(int argc, char* argv[]) {
		android::base::InitLogging(argv, MyLogger);
		if (argc > 0 && android::base::Basename(argv[0]) == "clean_scratch_files"s) {
		return do_clean_scratch_files();
		}

		// Make sure we are root.
		if (::getuid() != 0) {
		@@ -509,7 +508,6 @@ int main(int argc, char* argv[]) {
		{"help", no_argument, nullptr, 'h'},
		{"reboot", no_argument, nullptr, 'R'},
		{"verbose", no_argument, nullptr, 'v'},
		{"clean_scratch_files", no_argument, nullptr, 'C'},
		{0, 0, nullptr, 0},
		};
		for (int opt; (opt = ::getopt_long(argc, argv, "hRT:v", longopts, nullptr)) != -1;) {
		@@ -530,8 +528,6 @@ int main(int argc, char* argv[]) {
		case 'v':
		verbose = true;
		break;
		case 'C':
		return do_clean_scratch_files();
		default:
		LOG(ERROR) << "Bad Argument -" << char(opt);
		usage(BADARG);