[XrdCl] Simplify XRootDMsgHandler::InspectStatusRsp.

xrootd · Nov 23, 2021 · faf62ef · faf62ef
1 parent cce3271
commit faf62ef
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/src/XrdCl/XrdClAsyncMsgReader.hh b/src/XrdCl/XrdClAsyncMsgReader.hh
@@ -161,7 +161,7 @@ namespace XrdCl
               //----------------------------------------------------------------
               if( !inchandler )
               {
-                uint16_t action = strm.InspectStatusRsp( *incmsg, substrmnb,
+                uint16_t action = strm.InspectStatusRsp( substrmnb,
                                                          inchandler );
 
                 if( action & IncomingMsgHandler::Corrupted )

diff --git a/src/XrdCl/XrdClChannel.cc b/src/XrdCl/XrdClChannel.cc
@@ -75,7 +75,7 @@ namespace
       //------------------------------------------------------------------------
       //! Reexamine the incoming message, and decide on the action to be taken
       //------------------------------------------------------------------------
-      virtual uint16_t InspectStatusRsp( XrdCl::Message &msg )
+      virtual uint16_t InspectStatusRsp()
       {
         return 0;
       }

diff --git a/src/XrdCl/XrdClPostMasterInterfaces.hh b/src/XrdCl/XrdClPostMasterInterfaces.hh
@@ -130,7 +130,7 @@ namespace XrdCl
       //! @return       action type that needs to be take wrt the message and
       //!               the handler
       //------------------------------------------------------------------------
-      virtual uint16_t InspectStatusRsp( Message &msg ) = 0;
+      virtual uint16_t InspectStatusRsp() = 0;
 
       //------------------------------------------------------------------------
       //! Get handler sid

diff --git a/src/XrdCl/XrdClStream.cc b/src/XrdCl/XrdClStream.cc
@@ -1115,14 +1115,13 @@ namespace XrdCl
   //!
   //! @return : a IncomingMsgHandler in case we need to read out raw data
   //----------------------------------------------------------------------------
-  uint16_t Stream::InspectStatusRsp( Message             &msg,
-                                     uint16_t             stream,
+  uint16_t Stream::InspectStatusRsp( uint16_t             stream,
                                      IncomingMsgHandler *&incHandler )
   {
     InMessageHelper &mh = pSubStreams[stream]->inMsgHelper;
     if( !mh.handler ) return false;
 
-    uint16_t action = mh.handler->InspectStatusRsp( msg );
+    uint16_t action = mh.handler->InspectStatusRsp();
     mh.action |= action;
 
     if( action & IncomingMsgHandler::RemoveHandler )

diff --git a/src/XrdCl/XrdClStream.hh b/src/XrdCl/XrdClStream.hh
@@ -253,7 +253,7 @@ namespace XrdCl
       //!
       //! @return : a IncomingMsgHandler in case we need to read out raw data
       //------------------------------------------------------------------------
-      uint16_t InspectStatusRsp( Message &msg, uint16_t stream, IncomingMsgHandler *&incHandler );
+      uint16_t InspectStatusRsp( uint16_t stream, IncomingMsgHandler *&incHandler );
 
       //------------------------------------------------------------------------
       //! Set the on-connect handler for data streams

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.cc b/src/XrdCl/XrdClXRootDMsgHandler.cc
@@ -324,10 +324,10 @@ namespace XrdCl
   //----------------------------------------------------------------------------
   // Reexamine the incoming message, and decide on the action to be taken
   //----------------------------------------------------------------------------
-  uint16_t XRootDMsgHandler::InspectStatusRsp( Message &msg )
+  uint16_t XRootDMsgHandler::InspectStatusRsp()
   {
     Log *log = DefaultEnv::GetLog();
-    ServerResponse *rsp = (ServerResponse *)msg.GetBuffer();
+    ServerResponse *rsp = (ServerResponse *)pResponse->GetBuffer();
 
     //--------------------------------------------------------------------------
     // Additional action is only required for kXR_status
@@ -337,7 +337,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     // Ignore malformed status response
     //--------------------------------------------------------------------------
-    if( msg.GetSize() < sizeof( ServerResponseStatus ) )
+    if( pResponse->GetSize() < sizeof( ServerResponseStatus ) )
       return Ignore;
 
     ClientRequest  *req    = (ClientRequest *)pRequest->GetBuffer();
@@ -347,7 +347,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     if( !pRspStatusBodyUnMarshaled )
     {
-      XRootDStatus st = XRootDTransport::UnMarshalStatusBody( msg, reqId );
+      XRootDStatus st = XRootDTransport::UnMarshalStatusBody( *pResponse, reqId );
 
       if( !st.IsOK() && st.code == errDataError )
       {
@@ -370,7 +370,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     // Common handling for partial results
     //--------------------------------------------------------------------------
-    ServerResponseStatus *rspst   = (ServerResponseStatus*)msg.GetBuffer();
+    ServerResponseStatus *rspst   = (ServerResponseStatus*)pResponse->GetBuffer();
     if( rspst->bdy.resptype == XrdProto::kXR_PartialResult )
     {
       pPartialResps.push_back( std::move( pResponse ) );
@@ -407,12 +407,12 @@ namespace XrdCl
       // send some additional data pointing to the pages that need to be
       // retransmitted
       if( size_t( sizeof( ServerResponseHeader ) + rspst->hdr.dlen + rspst->bdy.dlen ) >
-          msg.GetCursor() )
+        pResponse->GetCursor() )
         action |= More;
       // if we already have this data we need to unmarshal it
       else if( !pRspPgWrtRetrnsmReqUnMarshalled )
       {
-        XRootDStatus st = XRootDTransport::UnMarchalStatusCSE( msg );
+        XRootDStatus st = XRootDTransport::UnMarchalStatusCSE( *pResponse );
         if( !st.IsOK() && st.code == errDataError )
         {
           log->Error( XRootDMsg, "[%s] %s", pUrl.GetHostId().c_str(),

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.hh b/src/XrdCl/XrdClXRootDMsgHandler.hh
@@ -258,7 +258,7 @@ namespace XrdCl
       //! @return       action type that needs to be take wrt the message and
       //!               the handler
       //------------------------------------------------------------------------
-      virtual uint16_t InspectStatusRsp( Message &msg );
+      virtual uint16_t InspectStatusRsp();
 
       //------------------------------------------------------------------------
       //! Get handler sid