[go: nahoru, domu]

Fix more MSVC warnings, courgette/ edition.

This is mostly about changing types and inserting casts so as to avoid implicit
value truncations.

BUG=81439
TEST=none

Review URL: https://codereview.chromium.org/613893002

Cr-Commit-Position: refs/heads/master@{#298069}
diff --git a/courgette/disassembler_elf_32.cc b/courgette/disassembler_elf_32.cc
index bfd1ef4..ff2b9e03 100644
--- a/courgette/disassembler_elf_32.cc
+++ b/courgette/disassembler_elf_32.cc
@@ -405,16 +405,12 @@
     size_t start_file_offset,
     size_t end_file_offset,
     AssemblyProgram* program) {
-
-  const uint8* start = OffsetToPointer(start_file_offset);
-  const uint8* end = OffsetToPointer(end_file_offset);
-
   // Callers don't guarantee start < end
-  if (start >= end) return true;
+  if (start_file_offset >= end_file_offset) return true;
 
-  const ptrdiff_t len = end - start;  // Works because vars are byte pointers
+  const size_t len = end_file_offset - start_file_offset;
 
-  if (!program->EmitBytesInstruction(start, len))
+  if (!program->EmitBytesInstruction(OffsetToPointer(start_file_offset), len))
     return false;
 
   return true;