Switch to standard integer types in courgette/.

courgette/third_party/bsdiff_apply.cc

 /*-
  * Copyright 2003,2004 Colin Percival
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted providing that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 18 matching lines @@
  * 2013-04-10 - Add wrapper method to apply a patch to files directly.
  *                --Joshua Pawlicki <waffles@chromium.org>
  */
 
 // Copyright (c) 2009 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.
 
 #include "courgette/third_party/bsdiff.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/memory_mapped_file.h"
 #include "courgette/crc.h"
 #include "courgette/streams.h"
 
 namespace courgette {
 
 BSDiffStatus MBS_ReadHeader(SourceStream* stream, MBSPatchHeader* header) {
   if (!stream->Read(header->tag, sizeof(header->tag))) return READ_ERROR;
   if (!stream->ReadVarint32(&header->slen)) return READ_ERROR;
   if (!stream->ReadVarint32(&header->scrc32)) return READ_ERROR;
   if (!stream->ReadVarint32(&header->dlen)) return READ_ERROR;
 
   // The string will have a NUL terminator that we don't use, hence '-1'.
   static_assert(sizeof(MBS_PATCH_HEADER_TAG) - 1 == sizeof(header->tag),
                 "MBS_PATCH_HEADER_TAG must match header field size");
   if (memcmp(header->tag, MBS_PATCH_HEADER_TAG, 8) != 0)
     return UNEXPECTED_ERROR;
 
   return OK;
 }
 
-BSDiffStatus MBS_ApplyPatch(const MBSPatchHeader *header,
+BSDiffStatus MBS_ApplyPatch(const MBSPatchHeader* header,
                             SourceStream* patch_stream,
-                            const uint8* old_start, size_t old_size,
+                            const uint8_t* old_start,
+                            size_t old_size,
                             SinkStream* new_stream) {
-  const uint8* old_end = old_start + old_size;
+  const uint8_t* old_end = old_start + old_size;
 
   SourceStreamSet patch_streams;
   if (!patch_streams.Init(patch_stream))
     return READ_ERROR;
 
   SourceStream* control_stream_copy_counts = patch_streams.stream(0);
   SourceStream* control_stream_extra_counts = patch_streams.stream(1);
   SourceStream* control_stream_seeks = patch_streams.stream(2);
   SourceStream* diff_skips = patch_streams.stream(3);
   SourceStream* diff_bytes = patch_streams.stream(4);
   SourceStream* extra_bytes = patch_streams.stream(5);
 
-  const uint8* extra_start = extra_bytes->Buffer();
-  const uint8* extra_end = extra_start + extra_bytes->Remaining();
-  const uint8* extra_position = extra_start;
+  const uint8_t* extra_start = extra_bytes->Buffer();
+  const uint8_t* extra_end = extra_start + extra_bytes->Remaining();
+  const uint8_t* extra_position = extra_start;
 
-  const uint8* old_position = old_start;
+  const uint8_t* old_position = old_start;
 
   if (header->dlen && !new_stream->Reserve(header->dlen))
     return MEM_ERROR;
 
-  uint32 pending_diff_zeros = 0;
+  uint32_t pending_diff_zeros = 0;
   if (!diff_skips->ReadVarint32(&pending_diff_zeros))
     return UNEXPECTED_ERROR;
 
   while (!control_stream_copy_counts->Empty()) {
-    uint32 copy_count, extra_count;
-    int32 seek_adjustment;
+    uint32_t copy_count, extra_count;
+    int32_t seek_adjustment;
     if (!control_stream_copy_counts->ReadVarint32(&copy_count))
       return UNEXPECTED_ERROR;
     if (!control_stream_extra_counts->ReadVarint32(&extra_count))
       return UNEXPECTED_ERROR;
     if (!control_stream_seeks->ReadVarint32Signed(&seek_adjustment))
       return UNEXPECTED_ERROR;
 
 #ifdef DEBUG_bsmedberg
     printf("Applying block:  copy: %-8u extra: %-8u seek: %+i\n",
            copy_count, extra_count, seek_adjustment);
 #endif
     // Byte-wise arithmetically add bytes from old file to bytes from the diff
     // block.
     if (copy_count > static_cast<size_t>(old_end - old_position))
       return UNEXPECTED_ERROR;
 
     // Add together bytes from the 'old' file and the 'diff' stream.
     for (size_t i = 0;  i < copy_count;  ++i) {
-      uint8 diff_byte = 0;
+      uint8_t diff_byte = 0;
       if (pending_diff_zeros) {
         --pending_diff_zeros;
       } else {
         if (!diff_skips->ReadVarint32(&pending_diff_zeros))
           return UNEXPECTED_ERROR;
         if (!diff_bytes->Read(&diff_byte, 1))
           return UNEXPECTED_ERROR;
       }
-      uint8 byte = old_position[i] + diff_byte;
+      uint8_t byte = old_position[i] + diff_byte;
       if (!new_stream->Write(&byte, 1))
         return MEM_ERROR;
     }
     old_position += copy_count;
 
     // Copy bytes from the extra block.
     if (extra_count > static_cast<size_t>(extra_end - extra_position))
       return UNEXPECTED_ERROR;
 
     if (!new_stream->Write(extra_position, extra_count))
@@ skipping 20 matching lines @@
   return OK;
 }
 
 BSDiffStatus ApplyBinaryPatch(SourceStream* old_stream,
                               SourceStream* patch_stream,
                               SinkStream* new_stream) {
   MBSPatchHeader header;
   BSDiffStatus ret = MBS_ReadHeader(patch_stream, &header);
   if (ret != OK) return ret;
 
-  const uint8* old_start = old_stream->Buffer();
+  const uint8_t* old_start = old_stream->Buffer();
   size_t old_size = old_stream->Remaining();
 
   if (old_size != header.slen) return UNEXPECTED_ERROR;
 
   if (CalculateCrc(old_start, old_size) != header.scrc32)
     return CRC_ERROR;
 
   MBS_ApplyPatch(&header, patch_stream, old_start, old_size, new_stream);
 
   return OK;
@@ skipping 31 matching lines @@
   int written = base::WriteFile(
       new_file_path,
       reinterpret_cast<const char*>(new_sink_stream.Buffer()),
       static_cast<int>(new_sink_stream.Length()));
   if (written != static_cast<int>(new_sink_stream.Length()))
     return WRITE_ERROR;
   return OK;
 }
 
 }  // namespace