GCC 4.6 warnings cleanup

library.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define XOPEN_SOURCE 500
 
 #include "library.h"
 
 #include <algorithm>
 #include <elf.h>
@@ skipping 463 matching lines @@
     if (is_gs_call ||
         (code[codeIdx].insn == 0xCD &&
          code[codeIdx].addr[1] == '\x80' /* INT $0x80 */)) {
     #else
     #error Unsupported target platform
     #endif
       // Found a system call. Search backwards to figure out how to redirect
       // the code. We will need to overwrite a couple of instructions and,
       // of course, move these instructions somewhere else.
       int startIdx = codeIdx;
-      int endIdx = codeIdx;
       int length = code[codeIdx].len;
       for (int idx = codeIdx;
            (idx = (idx + (sizeof(code) / sizeof(struct Code)) - 1) %
                   (sizeof(code) / sizeof(struct Code))) != codeIdx; ) {
         BranchTargets::const_iterator iter =
             std::upper_bound(branch_targets.begin(), branch_targets.end(),
                              code[idx].addr);
         if (iter != branch_targets.end() && *iter < ptr) {
           // Found a branch pointing to somewhere past our instruction. This
           // instruction cannot be moved safely. Leave it in place.
@@ skipping 27 matching lines @@
           // Found branch target pointing to our instruction
           break;
         }
         char *tmp_rm;
         code[i].addr = next;
         code[i].insn = next_inst((const char **)&next, __WORDSIZE == 64,
                                  0, 0, &tmp_rm, 0, 0);
         code[i].len = next - code[i].addr;
         code[i].is_ip_relative = tmp_rm && (*tmp_rm & 0xC7) == 0x5;
         if (!code[i].is_ip_relative && isSafeInsn(code[i].insn)) {
-          endIdx = i;
           length = next - code[startIdx].addr;
         } else {
           break;
         }
       }
       // We now know, how many instructions neighboring the system call we
       // can safely overwrite. On x86-32 we need six bytes, and on x86-64
       // We need five bytes to insert a JMPQ and a 32bit address. We then
       // jump to a code fragment that safely forwards to our system call
       // entrypoint.
@@ skipping 705 matching lines @@
   }
   iter = symbols_.find("__kernel_rt_sigreturn");
   if (iter != symbols_.end() && iter->second.st_value) {
     __kernel_rt_sigreturn = asr_offset_ + iter->second.st_value;
   }
 
   return true;
 }
 
 } // namespace