From 82b0e9d5fbc6518009b0a42a4ebf9da68eafc132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 24 May 2018 16:23:40 -0400
Subject: [PATCH] data transfer: fix warnings
Change-Id: I0c696b635bd7940d9d9803ecb577ef436943ded3
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
---
src/data_transfer.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/data_transfer.cpp b/src/data_transfer.cpp
index 8fe14befae..fece7ccc77 100644
--- a/src/data_transfer.cpp
+++ b/src/data_transfer.cpp
@@ -166,7 +166,6 @@ OptimisticMetaOutgoingInfo::updateInfo(const DRing::DataTransferInfo& info) cons
{
bool emitCodeChanged = false;
bool checkOngoing = false;
- DRing::DataTransferEventCode lastEvent { DRing::DataTransferEventCode::invalid };
{
std::lock_guard<std::mutex> lk {infoMutex_};
if (info_.lastEvent > DRing::DataTransferEventCode::timeout_expired) {
@@ -273,7 +272,7 @@ private:
SubOutgoingFileTransfer::SubOutgoingFileTransfer(DRing::DataTransferId tid,
const std::string& peerUri,
std::shared_ptr<OptimisticMetaOutgoingInfo> metaInfo)
- : DataTransfer(tid), peerUri_ {peerUri}, metaInfo_(metaInfo)
+ : DataTransfer(tid), metaInfo_(metaInfo), peerUri_(peerUri)
{
info_ = metaInfo_->info();
@@ -385,7 +384,7 @@ SubOutgoingFileTransfer::emit(DRing::DataTransferEventCode code) const
}
metaInfo_->updateInfo(info_);
if (code == DRing::DataTransferEventCode::wait_peer_acceptance) {
- timeoutThread_ = std::move(std::unique_ptr<std::thread>(new std::thread([this]() {
+ timeoutThread_ = std::unique_ptr<std::thread>(new std::thread([this]() {
const auto TEN_MIN = 1000 * 60 * 10;
const auto SLEEP_DURATION = 100;
for (auto i = 0; i < TEN_MIN / SLEEP_DURATION; ++i) {
@@ -396,7 +395,7 @@ SubOutgoingFileTransfer::emit(DRing::DataTransferEventCode code) const
}
RING_WARN() << "FTP#" << this->getId() << ": timeout. Cancel";
this->closeAndEmit(DRing::DataTransferEventCode::timeout_expired);
- })));
+ }));
} else if (timeoutThread_) {
stopTimeout_ = true;
}
--
GitLab