Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4577dff5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Address the warnings in recovery code"

parents a69c69b2 fb08b015
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ bool ZipModeImage::SplitZipModeImageWithLimit(const ZipModeImage& tgt_image,
        used_src_ranges.Insert(src_ranges);
        split_src_ranges->push_back(std::move(src_ranges));
      }
      src_ranges.Clear();
      src_ranges = {};

      // We don't have enough space for the current chunk; start a new split image and handle
      // this chunk there.
@@ -1035,7 +1035,7 @@ bool ZipModeImage::AddSplitImageFromChunkList(const ZipModeImage& tgt_image,
  }

  ZipModeImage split_tgt_image(false);
  split_tgt_image.Initialize(std::move(aligned_tgt_chunks), {});
  split_tgt_image.Initialize(aligned_tgt_chunks, {});
  split_tgt_image.MergeAdjacentNormalChunks();

  // Construct the dummy source file based on the src_ranges.
@@ -1051,7 +1051,7 @@ bool ZipModeImage::AddSplitImageFromChunkList(const ZipModeImage& tgt_image,
  CHECK(!src_content.empty());

  ZipModeImage split_src_image(true);
  split_src_image.Initialize(split_src_chunks, std::move(src_content));
  split_src_image.Initialize(split_src_chunks, src_content);

  split_tgt_images->push_back(std::move(split_tgt_image));
  split_src_images->push_back(std::move(split_src_image));
+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct Value {
    BLOB = 2,
  };

  Value(Type type, const std::string& str) : type(type), data(str) {}
  Value(Type type, std::string str) : type(type), data(std::move(str)) {}

  Type type;
  std::string data;
+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ class Command {
      : type_(type),
        index_(index),
        cmdline_(std::move(cmdline)),
        patch_(std::move(patch)),
        patch_(patch),
        target_(std::move(target)),
        source_(std::move(source)),
        stash_(std::move(stash)) {}