Merge branch 'rr-debugger:master' into fix_dotnet_doublemapping

Author: IamHuskar

src/ElfReader.cc

@@ -630,7 +630,7 @@ ScopedFd ElfFileReader::open_debug_file(const std::string& elf_file_name) {
     } else if (ret == 0) {
       break;
     } else {
-      crc = crc32(crc, buf, ret);
+      crc = update_crc32(crc, buf, ret);
     }
   }
 

src/util.cc

@@ -2159,7 +2159,7 @@ int choose_cpu(BindCPU bind_cpu, ScopedFd &cpu_lock_fd_out) {
   return cpus[random() % cpus.size()];
 }
 
-uint32_t crc32(uint32_t crc, unsigned char* buf, size_t len) {
+uint32_t update_crc32(uint32_t crc, unsigned char* buf, size_t len) {
   static const uint32_t crc32_table[256] = {
     0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
     0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,

src/util.h

@@ -527,7 +527,7 @@ int choose_cpu(BindCPU bind_cpu, ScopedFd& cpu_lock_fd_out);
 /* Updates an IEEE 802.3 CRC-32 least significant bit first from each byte in
  * |buf|.  Pre- and post-conditioning is not performed in this function and so
  * should be performed by the caller, as required. */
-uint32_t crc32(uint32_t crc, unsigned char* buf, size_t len);
+uint32_t update_crc32(uint32_t crc, unsigned char* buf, size_t len);
 
 /* Like write(2) but any error or "device full" is treated as fatal. We also
  * ensure that all bytes are written by looping on short writes. */