commit a808821d722d7f7f1a6f351e6b639c963394167b
author Hans Leidekker <hans@codeweavers.com> Tue Oct 03 16:14:41 2017 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 03 19:37:26 2017 +0200
tree 124c4f01119082eb5e877a0ece56c657e36d0150
parent 160f5b2387a7b1e36f254e5393770a2efd7397f5

webservices: Simplify get_field_size.

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

dlls/webservices/reader.c

diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index d767d5c..2ed9319 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -7311,28 +7311,8 @@
 
 static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc )
 {
-    WS_READ_OPTION option;
-    ULONG size;
-
-    switch ((option = get_field_read_option( desc->type, desc->options )))
-    {
-    case WS_READ_REQUIRED_POINTER:
-    case WS_READ_OPTIONAL_POINTER:
-    case WS_READ_NILLABLE_POINTER:
-        size = sizeof(void *);
-        break;
-
-    case WS_READ_REQUIRED_VALUE:
-    case WS_READ_NILLABLE_VALUE:
-        size = get_type_size( desc->type, desc->typeDescription );
-        break;
-
-    default:
-        WARN( "unhandled option %u\n", option );
-        return 0;
-    }
-
-    return size;
+    if (desc->options & WS_FIELD_POINTER) return sizeof(void *);
+    return get_type_size( desc->type, desc->typeDescription );
 }
 
 static HRESULT read_param( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void *ret )