[1/5] webservices: Simplify get_field_size.
Hans Leidekker
hans at codeweavers.com
Tue Oct 3 09:14:41 CDT 2017
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
dlls/webservices/reader.c | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index d767d5ce1b..2ed9319b1b 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -7311,28 +7311,8 @@ HRESULT get_param_desc( const WS_STRUCT_DESCRIPTION *desc, USHORT index, const W
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 )
--
2.11.0
More information about the wine-patches
mailing list