Hans Leidekker : webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0ac9f9d47015e74a05b43234f48812e092ab716a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0ac9f9d47015e74a05b43234f48812e092ab716a

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Tue Nov 27 14:13:07 2018 +0100

webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/webservices/msg.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c
index a53fd92..e28baa2 100644
--- a/dlls/webservices/msg.c
+++ b/dlls/webservices/msg.c
@@ -938,13 +938,6 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W
     return hr;
 }
 
-static HRESULT read_envelope_end( WS_XML_READER *reader )
-{
-    HRESULT hr;
-    if ((hr = WsReadEndElement( reader, NULL )) != S_OK) return hr; /* </s:Body> */
-    return WsReadEndElement( reader, NULL ); /* </s:Envelope> */
-}
-
 /**************************************************************************
  *          WsReadEnvelopeEnd		[webservices.@]
  */
@@ -967,7 +960,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error )
     }
 
     if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION;
-    else if ((hr = read_envelope_end( msg->reader_body )) == S_OK)
+    else if ((hr = WsReadEndElement( msg->reader_body, NULL )) == S_OK)
         msg->state = WS_MESSAGE_STATE_DONE;
 
     LeaveCriticalSection( &msg->cs );