From a6a448adb226ed2bc33ba83e1a9ed1ac5c8e990d Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 10 Nov 2016 10:49:40 +0000 Subject: Revert "Revert "Rename vdex-fd to output-vdex-fd, add input-vdex-fd."" This reverts commit d4acdd380f79f41959663d2fa442186cb4a185a8. Test: device boots, adb shell cmd package compile works. Test: oat_file_assistant_test bug:30937355 Change-Id: Iad2e66fd7f28ed9c1dc3cab344df7453aab4fa56 --- runtime/utils.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'runtime/utils.h') diff --git a/runtime/utils.h b/runtime/utils.h index 21df839131..1e9805790a 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -279,24 +279,34 @@ static inline const void* EntryPointToCodePointer(const void* entry_point) { using UsageFn = void (*)(const char*, ...); template -static void ParseUintOption(const StringPiece& option, +static void ParseIntOption(const StringPiece& option, const std::string& option_name, T* out, - UsageFn Usage, + UsageFn usage, bool is_long_option = true) { std::string option_prefix = option_name + (is_long_option ? "=" : ""); DCHECK(option.starts_with(option_prefix)) << option << " " << option_prefix; const char* value_string = option.substr(option_prefix.size()).data(); int64_t parsed_integer_value = 0; if (!ParseInt(value_string, &parsed_integer_value)) { - Usage("Failed to parse %s '%s' as an integer", option_name.c_str(), value_string); - } - if (parsed_integer_value < 0) { - Usage("%s passed a negative value %d", option_name.c_str(), parsed_integer_value); + usage("Failed to parse %s '%s' as an integer", option_name.c_str(), value_string); } *out = dchecked_integral_cast(parsed_integer_value); } +template +static void ParseUintOption(const StringPiece& option, + const std::string& option_name, + T* out, + UsageFn usage, + bool is_long_option = true) { + ParseIntOption(option, option_name, out, usage, is_long_option); + if (*out < 0) { + usage("%s passed a negative value %d", option_name.c_str(), *out); + *out = 0; + } +} + void ParseDouble(const std::string& option, char after_char, double min, -- cgit v1.2.3-59-g8ed1b