Merge pull request #1209 from ellert/compiler-warnings

Compiler warnings
xrootd · Jun 19, 2020 · c38d078 · c38d078
2 parents f81c945 + 5cc51a0
commit c38d078
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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,15 +280,15 @@ 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);
 }
 
 /******************************************************************************/
 
 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/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
@@ -150,7 +150,7 @@ namespace XrdCl
     RecycleSidMgr deleter;
     std::shared_ptr<SIDManager> 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
@@ -633,7 +633,7 @@ namespace XrdCl
       }
     }
 
-    return std::move( ret );
+    return ret;
   }
 
 

diff --git 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;
   }
 
   //------------------------------------------------------------------------

diff --git 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();
      }