From 9f9376fc2615dcce120602da6a069428938aee40 Mon Sep 17 00:00:00 2001 From: Pavel Pimenov Date: Sat, 4 Mar 2017 20:42:48 +0300 Subject: [PATCH] use inline is_digit (#1770) use is_digit in lazy_bdecode --- src/lazy_bdecode.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lazy_bdecode.cpp b/src/lazy_bdecode.cpp index 3bed98003..f57480f5e 100644 --- a/src/lazy_bdecode.cpp +++ b/src/lazy_bdecode.cpp @@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/config.hpp" #include "libtorrent/lazy_entry.hpp" #include "libtorrent/bdecode.hpp" // for error codes +#include "libtorrent/string_util.hpp" // for is_digit #include #include // for numeric_limits #include // for snprintf @@ -72,8 +73,6 @@ namespace libtorrent #define TORRENT_FAIL_BDECODE(code) do { ec = make_error_code(code); return fail(error_pos, stack, start, orig_start); } TORRENT_WHILE_0 - bool numeric(char c) { return c >= '0' && c <= '9'; } - char const* find_char(char const* start, char const* end, char delimiter) { while (start < end && *start != delimiter) ++start; @@ -127,7 +126,7 @@ namespace libtorrent stack.pop_back(); continue; } - if (!numeric(t)) TORRENT_FAIL_BDECODE(bdecode_errors::expected_digit); + if (!is_digit(t)) TORRENT_FAIL_BDECODE(bdecode_errors::expected_digit); std::int64_t len = t - '0'; bdecode_errors::error_code_enum e = bdecode_errors::no_error; start = parse_int(start, end, ':', len, e); @@ -197,7 +196,7 @@ namespace libtorrent } default: { - if (!numeric(t)) + if (!is_digit(t)) TORRENT_FAIL_BDECODE(bdecode_errors::expected_value); std::int64_t len = t - '0';