From 46072931a9b9ee410eb85e380248bb3b76863ca0 Mon Sep 17 00:00:00 2001
From: Philippe Canal <pcanal@fnal.gov>
Date: Mon, 1 Mar 2021 14:03:08 -0600
Subject: [PATCH] [NFC] Coding style
---
core/meta/src/TIsAProxy.cxx | 2 +-
io/io/src/TBufferMerger.cxx | 9 ++-------
tree/tree/src/TTreeCloner.cxx | 7 ++++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/core/meta/src/TIsAProxy.cxx b/core/meta/src/TIsAProxy.cxx
index b7a82c5d3fb..55b463452d9 100644
--- a/core/meta/src/TIsAProxy.cxx
+++ b/core/meta/src/TIsAProxy.cxx
@@ -135,7 +135,7 @@ TClass* TIsAProxy::operator()(const void *obj)
}
fLasts[next].store(last);
- return last == nullptr ? nullptr : last->second;
+ return last ? last->second : nullptr;
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/io/io/src/TBufferMerger.cxx b/io/io/src/TBufferMerger.cxx
index e53ca46a11c..7575e45f85d 100644
--- a/io/io/src/TBufferMerger.cxx
+++ b/io/io/src/TBufferMerger.cxx
@@ -50,8 +50,7 @@ TBufferMerger::~TBufferMerger()
if (!fQueue.empty())
Merge();
- TFile *out = fMerger.GetOutputFile();
- if (out)
+ if (TFile *out = fMerger.GetOutputFile())
out->Write("",TObject::kOverwrite);
}
@@ -132,18 +131,14 @@ void TBufferMerger::MergeImpl()
bool TBufferMerger::TryMerge(ROOT::Experimental::TBufferMergerFile *memfile)
{
- if (fMergeMutex.try_lock())
- {
+ if (fMergeMutex.try_lock()) {
memfile->WriteStreamerInfo();
fMerger.AddFile(memfile);
MergeImpl();
fMergeMutex.unlock();
return true;
} else
- {
return false;
- }
-
}
} // namespace Experimental
diff --git a/tree/tree/src/TTreeCloner.cxx b/tree/tree/src/TTreeCloner.cxx
index 34f0662081d..a98260612af 100644
--- a/tree/tree/src/TTreeCloner.cxx
+++ b/tree/tree/src/TTreeCloner.cxx
@@ -740,10 +740,11 @@ void TTreeCloner::WriteBaskets()
if (fFileCache && j >= notCached) {
notCached = FillCache(notCached);
}
- if (from->GetBasketBytes()[index] == 0) {
- from->GetBasketBytes()[index] = basket->ReadBasketBytes(pos, fromfile);
- }
Int_t len = from->GetBasketBytes()[index];
+ if (len == 0) {
+ len = basket->ReadBasketBytes(pos, fromfile);
+ from->GetBasketBytes()[index] = len;
+ }
basket->LoadBasketBuffers(pos,len,fromfile,fFromTree);
basket->IncrementPidOffset(fPidOffset);
--
GitLab