From 46ef7595d0cadd5cd7e0cd511015ecda5673ef2c Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Mon, 2 Nov 2020 21:47:56 -0800 Subject: [PATCH] libsnapshot: Fix some minor formatting bugs A few minor issues snuck through code review. Removed a debug line in cow_api_test to persist file. Removed unused function declaration for cow writer Switched PLOG to LOG where no errno exists. Change-Id: Ibb774d6de518fc2a8746e4b9eefc3655c9973c30 Bug: 168554689 Test: cow_api_test --- fs_mgr/libsnapshot/cow_api_test.cpp | 1 - fs_mgr/libsnapshot/cow_writer.cpp | 2 +- fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fs_mgr/libsnapshot/cow_api_test.cpp b/fs_mgr/libsnapshot/cow_api_test.cpp index 3d0321f7a..1408244ca 100644 --- a/fs_mgr/libsnapshot/cow_api_test.cpp +++ b/fs_mgr/libsnapshot/cow_api_test.cpp @@ -272,7 +272,6 @@ TEST_F(CowTest, GetSize) { } TEST_F(CowTest, Append) { - cow_->DoNotRemove(); CowOptions options; auto writer = std::make_unique(options); ASSERT_TRUE(writer->Initialize(cow_->fd)); diff --git a/fs_mgr/libsnapshot/cow_writer.cpp b/fs_mgr/libsnapshot/cow_writer.cpp index ec2dc9601..f2692dc8c 100644 --- a/fs_mgr/libsnapshot/cow_writer.cpp +++ b/fs_mgr/libsnapshot/cow_writer.cpp @@ -247,7 +247,7 @@ bool CowWriter::OpenForAppend(uint64_t label) { } if (!found_label) { - PLOG(ERROR) << "Failed to find last label"; + LOG(ERROR) << "Failed to find last label"; return false; } diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h index c031d63b2..0f47622c6 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h @@ -114,7 +114,6 @@ class CowWriter : public ICowWriter { bool OpenForWrite(); bool OpenForAppend(); bool OpenForAppend(uint64_t label); - bool ImportOps(std::unique_ptr iter); bool GetDataPos(uint64_t* pos); bool WriteRawData(const void* data, size_t size); bool WriteOperation(const CowOperation& op, const void* data = nullptr, size_t size = 0);