commit 19a6aa624174f5c21a2e57773c7e1faa5979117c
author Daniel Zheng <zhengdaniel@google.com> Wed Sep 13 14:28:54 2023 -0700
committer Daniel Zheng <zhengdaniel@google.com> Wed Sep 13 22:14:19 2023 -0700
tree 490aba20e6c3e7eb0885bb64b972a9852c23ff1f
parent b309292859edc1ec9b4df298e6e236067b2b6ed8

Concatenate conditional

Move two separate conditional checks to one in writer_v2

Test: m libsnapshot
Change-Id: Id70db313754b770e3fa091e9c127839b9f2a5138

fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp

diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp
index ee445a2..699529b 100644
--- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp
+++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp
@@ -636,10 +636,8 @@
 }
 
 bool CowWriterV2::WriteOperation(const CowOperation& op, const void* data, size_t size) {
-    if (!EnsureSpaceAvailable(next_op_pos_ + sizeof(op))) {
-        return false;
-    }
-    if (!EnsureSpaceAvailable(next_data_pos_ + size)) {
+    if (!EnsureSpaceAvailable(next_op_pos_ + sizeof(op)) ||
+        !EnsureSpaceAvailable(next_data_pos_ + size)) {
         return false;
     }