From d24f77c040b0e1ea170fa398ec21767c2ce1ad3a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 28 May 2020 11:35:24 +0200 Subject: [PATCH 1/2] Fix -Wmisleading-indentation warnings --- src/Xrd/XrdLink.cc | 14 +++++++------- src/XrdSsi/XrdSsiClient.cc | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Xrd/XrdLink.cc b/src/Xrd/XrdLink.cc index 4cd48def13e..5eb8da1d72d 100644 --- a/src/Xrd/XrdLink.cc +++ b/src/Xrd/XrdLink.cc @@ -270,7 +270,7 @@ XrdNetAddr *XrdLink::NetAddr() const {return linkXQ.NetAddr();} int XrdLink::Peek(char *Buff, int Blen, int timeout) { if (isTLS) return linkXQ.TLS_Peek(Buff, Blen, timeout); - return linkXQ.Peek (Buff, Blen, timeout); + else return linkXQ.Peek (Buff, Blen, timeout); } /******************************************************************************/ @@ -280,7 +280,7 @@ int XrdLink::Peek(char *Buff, int Blen, int timeout) int XrdLink::Recv(char *Buff, int Blen) { if (isTLS) return linkXQ.TLS_Recv(Buff, Blen); - return linkXQ.Recv (Buff, Blen); + else return linkXQ.Recv (Buff, Blen); } /******************************************************************************/ @@ -288,7 +288,7 @@ int XrdLink::Recv(char *Buff, int Blen) int XrdLink::Recv(char *Buff, int Blen, int timeout) { if (isTLS) return linkXQ.TLS_Recv(Buff, Blen, timeout); - return linkXQ.Recv (Buff, Blen, timeout); + else return linkXQ.Recv (Buff, Blen, timeout); } /******************************************************************************/ @@ -298,7 +298,7 @@ int XrdLink::Recv(char *Buff, int Blen, int timeout) int XrdLink::RecvAll(char *Buff, int Blen, int timeout) { if (isTLS) return linkXQ.TLS_RecvAll(Buff, Blen, timeout); - return linkXQ.RecvAll (Buff, Blen, timeout); + else return linkXQ.RecvAll (Buff, Blen, timeout); } /******************************************************************************/ @@ -317,7 +317,7 @@ bool XrdLink::Register(const char *hName) int XrdLink::Send(const char *Buff, int Blen) { if (isTLS) return linkXQ.TLS_Send(Buff, Blen); - return linkXQ.Send (Buff, Blen); + else return linkXQ.Send (Buff, Blen); } /******************************************************************************/ @@ -331,7 +331,7 @@ int XrdLink::Send(const struct iovec *iov, int iocnt, int bytes) // Execute the send // if (isTLS) return linkXQ.TLS_Send(iov, iocnt, bytes); - return linkXQ.Send (iov, iocnt, bytes); + else return linkXQ.Send (iov, iocnt, bytes); } /******************************************************************************/ @@ -348,7 +348,7 @@ int XrdLink::Send(const sfVec *sfP, int sfN) // Do the send // if (isTLS) return linkXQ.TLS_Send(sfP, sfN); - return linkXQ.Send (sfP, sfN); + else return linkXQ.Send (sfP, sfN); } /******************************************************************************/ diff --git a/src/XrdSsi/XrdSsiClient.cc b/src/XrdSsi/XrdSsiClient.cc index 1bc8c1dff23..50a53575859 100644 --- a/src/XrdSsi/XrdSsiClient.cc +++ b/src/XrdSsi/XrdSsiClient.cc @@ -149,7 +149,7 @@ XrdSsiService *XrdSsiClientProvider::GetService(XrdSsiErrInfo &eInfo, if (!dsTTLSet) clEnvP->PutInt("DataServerTTL", maxTMO); if (!reqTOSet) clEnvP->PutInt("RequestTimeout", maxTMO); if (!strTOSet) clEnvP->PutInt("StreamTimeout", maxTMO); - clEnvP->PutInt("ParallelEvtLoop",maxPEL); + clEnvP->PutInt("ParallelEvtLoop",maxPEL); initDone = true; clMutex.UnLock(); } From 5cc51a08090b874d10180e019e6bceb0372e8445 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 28 May 2020 11:36:04 +0200 Subject: [PATCH 2/2] Fix -Wpessimizing-move warnings --- src/XrdCl/XrdClMetalinkRedirector.hh | 2 +- src/XrdCl/XrdClSIDManager.cc | 2 +- src/XrdCl/XrdClUtils.cc | 2 +- src/XrdCl/XrdClXRootDResponses.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/XrdCl/XrdClMetalinkRedirector.hh b/src/XrdCl/XrdClMetalinkRedirector.hh index 6485ce65a1d..fffd771ef43 100644 --- a/src/XrdCl/XrdClMetalinkRedirector.hh +++ b/src/XrdCl/XrdClMetalinkRedirector.hh @@ -91,7 +91,7 @@ class MetalinkRedirector : public VirtualRedirector if( itr->first == "a32" ) ret.push_back( "adler32" ); else ret.push_back( itr->first ); } - return std::move( ret ); + return ret; } //---------------------------------------------------------------------------- diff --git a/src/XrdCl/XrdClSIDManager.cc b/src/XrdCl/XrdClSIDManager.cc index 32739620337..9cc573c3c6f 100644 --- a/src/XrdCl/XrdClSIDManager.cc +++ b/src/XrdCl/XrdClSIDManager.cc @@ -150,7 +150,7 @@ namespace XrdCl RecycleSidMgr deleter; std::shared_ptr ptr( mgr, deleter ); - return std::move( ptr ); + return ptr; } void SIDMgrPool::Recycle( SIDManager *mgr ) diff --git a/src/XrdCl/XrdClUtils.cc b/src/XrdCl/XrdClUtils.cc index c2c85aaf9b1..6482396fa97 100644 --- a/src/XrdCl/XrdClUtils.cc +++ b/src/XrdCl/XrdClUtils.cc @@ -633,7 +633,7 @@ namespace XrdCl } } - return std::move( ret ); + return ret; } diff --git a/src/XrdCl/XrdClXRootDResponses.cc b/src/XrdCl/XrdClXRootDResponses.cc index 99615fd9c38..b6ea53acc37 100644 --- a/src/XrdCl/XrdClXRootDResponses.cc +++ b/src/XrdCl/XrdClXRootDResponses.cc @@ -363,7 +363,7 @@ namespace XrdCl oct = pImpl->pMode[size - 1] - '0'; OctToString( oct, ret ); - return std::move( ret ); + return ret; } //------------------------------------------------------------------------