From 613e23976e01d126b0c4dd1de5b83d70fd392a39 Mon Sep 17 00:00:00 2001 From: Carlo Bramini Date: Sat, 12 Nov 2016 10:47:00 +0100 Subject: [PATCH] winhttp: Use return value of sprintf() instead of calling strlen() and simplify code. Signed-off-by: Carlo Bramini Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard --- dlls/winhttp/url.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 26969cdf669..e7bb2a57115 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -400,8 +400,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) { WCHAR port[sizeof("65535")]; - sprintfW( port, formatW, uc->nPort ); - *len += strlenW( port ); + *len += sprintfW( port, formatW, uc->nPort ); *len += 1; /* ":" */ } if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */ @@ -497,15 +496,10 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (!uses_default_port( scheme, uc->nPort )) { - WCHAR port[sizeof("65535")]; - - sprintfW( port, formatW, uc->nPort ); *url = ':'; url++; - len = strlenW( port ); - memcpy( url, port, len * sizeof(WCHAR) ); - url += len; + url += sprintfW( url, formatW, uc->nPort ); } /* add slash between hostname and path if necessary */ -- 2.11.4.GIT