premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

use inline is_digit (#1770) 

use is_digit in lazy_bdecode
This commit is contained in:
Pavel Pimenov 2017-03-04 20:42:48 +03:00 committed by Arvid Norberg
parent 1ae8856d93
commit 9f9376fc26
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lazy_bdecode.cpp
View File

@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
#include "libtorrent/lazy_entry.hpp" #include "libtorrent/lazy_entry.hpp"
#include "libtorrent/bdecode.hpp" // for error codes #include "libtorrent/bdecode.hpp" // for error codes
#include "libtorrent/string_util.hpp" // for is_digit
#include <cstring> #include <cstring>
#include <limits> // for numeric_limits #include <limits> // for numeric_limits
#include <cstdio> // for snprintf #include <cstdio> // 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 #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) char const* find_char(char const* start, char const* end, char delimiter)
{ {
while (start < end && *start != delimiter) ++start; while (start < end && *start != delimiter) ++start;
@ -127,7 +126,7 @@ namespace libtorrent
stack.pop_back(); stack.pop_back();
continue; 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'; std::int64_t len = t - '0';
bdecode_errors::error_code_enum e = bdecode_errors::no_error; bdecode_errors::error_code_enum e = bdecode_errors::no_error;
start = parse_int(start, end, ':', len, e); start = parse_int(start, end, ':', len, e);
@ -197,7 +196,7 @@ namespace libtorrent
} }
default: default:
{ {
if (!numeric(t)) if (!is_digit(t))
TORRENT_FAIL_BDECODE(bdecode_errors::expected_value); TORRENT_FAIL_BDECODE(bdecode_errors::expected_value);
std::int64_t len = t - '0'; std::int64_t len = t - '0';