webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.

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

webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.
0ac9f9d4 · Hans Leidekker · Alexandre Julliard · a0f00bd6 · 0ac9f9d4
Commit 0ac9f9d4 authored Nov 27, 2018 by Hans Leidekker Committed by Alexandre Julliard Nov 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

msg.c dlls/webservices/msg.c +1 -8

No files found.
--- 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 );