From 675335165619c6fac4c0c8ab099e965f3c15263a Mon Sep 17 00:00:00 2001 From: wangyantian Date: Tue, 15 Mar 2022 19:13:32 +0800 Subject: [PATCH] Fix codex warnings. Signed-off-by: wangyantian --- assembler/assembly-parser.cpp | 2 +- assembler/assembly-parser.h | 2 +- libpandabase/os/unix/futex/mutex.cpp | 4 ++-- libpandabase/os/unix/sighooklib/sighook.cpp | 2 +- libpandabase/utils/murmur3_hash.h | 4 ++-- libpandabase/utils/utf.cpp | 4 ++-- libpandafile/debug_info_extractor.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assembler/assembly-parser.cpp b/assembler/assembly-parser.cpp index 623aff38e6..aa8c8be099 100644 --- a/assembler/assembly-parser.cpp +++ b/assembler/assembly-parser.cpp @@ -349,7 +349,7 @@ void Parser::ParseResetFunctionLabelsAndParams() for (const auto &t : context_.function_arguments_lists) { curr_func_ = &(program_.function_table.at(t.first)); - curr_func_->regs_num = curr_func_->value_of_first_param + 1; + curr_func_->regs_num = static_cast(curr_func_->value_of_first_param + 1); for (const auto &v : t.second) { if (!curr_func_->ins.empty() && curr_func_->ins.size() >= v.first && diff --git a/assembler/assembly-parser.h b/assembler/assembly-parser.h index 1e6b0d9dce..725a3906a9 100644 --- a/assembler/assembly-parser.h +++ b/assembler/assembly-parser.h @@ -112,7 +112,7 @@ private: inline void GetWarning(const std::string &mess = "", Error::ErrorType err = Error::ErrorType::ERR_NONE, int8_t shift = 0, const std::string &add_mess = "") { - war_.emplace_back(mess, line_stric_, err, add_mess, context_.tokens[context_.number - 1].bound_left + shift, + war_.emplace_back(mess, line_stric_, err, add_mess, context_.tokens[context_.number - 1].bound_left + static_cast(shift), context_.tokens[context_.number - 1].bound_right, context_.tokens[context_.number - 1].whole_line, Error::ErrorClass::WARNING); } diff --git a/libpandabase/os/unix/futex/mutex.cpp b/libpandabase/os/unix/futex/mutex.cpp index 444e02e920..d3da1d38f2 100644 --- a/libpandabase/os/unix/futex/mutex.cpp +++ b/libpandabase/os/unix/futex/mutex.cpp @@ -440,8 +440,8 @@ const int64_t NANOSECONDS_PER_SEC = 1000000000; struct timespec ConvertTime(uint64_t ms, uint64_t ns) { struct timespec time = {0, 0}; - time_t seconds = ms / MILLISECONDS_PER_SEC; - time_t nanoseconds = (ms % MILLISECONDS_PER_SEC) * NANOSECONDS_PER_MILLISEC + ns; + auto seconds = static_cast(ms / MILLISECONDS_PER_SEC); + auto nanoseconds = static_cast((ms % MILLISECONDS_PER_SEC) * NANOSECONDS_PER_MILLISEC + ns); time.tv_sec += seconds; time.tv_nsec += nanoseconds; if (time.tv_nsec >= NANOSECONDS_PER_SEC) { diff --git a/libpandabase/os/unix/sighooklib/sighook.cpp b/libpandabase/os/unix/sighooklib/sighook.cpp index 1a5af97495..9cec549f1a 100644 --- a/libpandabase/os/unix/sighooklib/sighook.cpp +++ b/libpandabase/os/unix/sighooklib/sighook.cpp @@ -265,7 +265,7 @@ void SignalHook::Handler(int signo, siginfo_t *siginfo, void *ucontext_raw) } // Call user handler - size_t handler_flags = signal_hooks[signo].user_action_.sa_flags; + auto handler_flags = static_cast(signal_hooks[signo].user_action_.sa_flags); auto *ucontext = static_cast(ucontext_raw); sigset_t mask; sigemptyset(&mask); diff --git a/libpandabase/utils/murmur3_hash.h b/libpandabase/utils/murmur3_hash.h index 25dadd4539..91b48efcc1 100644 --- a/libpandabase/utils/murmur3_hash.h +++ b/libpandabase/utils/murmur3_hash.h @@ -121,7 +121,7 @@ private: // Get ((uint8_t*)tail)[i - 1]: uintptr_t block_pointer = tail + sizeof(uint8_t) * (i - 1); uint8_t block = *reinterpret_cast(block_pointer); - uint32_t temp = static_cast(block << (TAIL_SHIFT * (i - 1U))); + uint32_t temp = static_cast(block) << (TAIL_SHIFT * (i - 1U)); k1 ^= temp; if (i == 1) { k1 = Rotl(k1, TAIL_LAST_SHIFT); @@ -180,7 +180,7 @@ private: uint32_t k1 = 0; for (size_t i = tail_len; i > 0; i--) { uint8_t block = memblock[i - 1U]; - uint32_t temp = static_cast(block << (TAIL_SHIFT * (i - 1U))); + uint32_t temp = static_cast(block) << (TAIL_SHIFT * (i - 1U)); k1 ^= temp; if (i == 1) { k1 = Rotl(k1, TAIL_LAST_SHIFT); diff --git a/libpandabase/utils/utf.cpp b/libpandabase/utils/utf.cpp index 8214beb39b..2f98d4319c 100644 --- a/libpandabase/utils/utf.cpp +++ b/libpandabase/utils/utf.cpp @@ -261,7 +261,7 @@ int CompareMUtf8ToMUtf8(const uint8_t *mutf8_1, const uint8_t *mutf8_2) auto [c1p1, c1p2] = SplitUtf16Pair(c1); auto [c2p1, c2p2] = SplitUtf16Pair(c2); - int result = c1p1 - c2p1; + auto result = static_cast(c1p1 - c2p1); if (result != 0) { return result; } @@ -308,7 +308,7 @@ int CompareUtf8ToUtf8(const uint8_t *utf8_1, size_t utf8_1_length, const uint8_t auto [c1p1, c1p2] = SplitUtf16Pair(c1); auto [c2p1, c2p2] = SplitUtf16Pair(c2); - int result = c1p1 - c2p1; + auto result = static_cast(c1p1 - c2p1); if (result != 0) { return result; } diff --git a/libpandafile/debug_info_extractor.cpp b/libpandafile/debug_info_extractor.cpp index a0aa3b4da5..74a25390e4 100644 --- a/libpandafile/debug_info_extractor.cpp +++ b/libpandafile/debug_info_extractor.cpp @@ -222,7 +222,7 @@ private: { ASSERT(static_cast(opcode) >= LineNumberProgramItem::OPCODE_BASE); - auto adjust_opcode = static_cast(opcode) - LineNumberProgramItem::OPCODE_BASE; + auto adjust_opcode = static_cast(opcode - LineNumberProgramItem::OPCODE_BASE); auto pc_offset = static_cast(adjust_opcode / LineNumberProgramItem::LINE_RANGE); int32_t line_offset = adjust_opcode % LineNumberProgramItem::LINE_RANGE + LineNumberProgramItem::LINE_BASE; state_.AdvancePc(pc_offset); -- Gitee