Skip to content

W
wine-cw
Commit 613e2397 authored by Carlo Bramini's avatar Carlo Bramini Committed by Alexandre Julliard
Browse files
Options

winhttp: Use return value of sprintf() instead of calling strlen() and simplify code.

Signed-off-by: 's avatarCarlo Bramini <carlo_bramini@users.sourceforge.net> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f9b87810
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
dlls/winhttp/url.c
View file @ 613e2397
...@@ -400,8 +400,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) ...@@ -400,8 +400,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len )
{ {
WCHAR port[sizeof("65535")]; WCHAR port[sizeof("65535")];
sprintfW( port, formatW, uc->nPort ); *len += sprintfW( port, formatW, uc->nPort );
*len += strlenW( port );
*len += 1; /* ":" */ *len += 1; /* ":" */
} }
if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */ if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */
...@@ -497,15 +496,10 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW ...@@ -497,15 +496,10 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW
if (!uses_default_port( scheme, uc->nPort )) if (!uses_default_port( scheme, uc->nPort ))
{ {
WCHAR port[sizeof("65535")];
sprintfW( port, formatW, uc->nPort );
*url = ':'; *url = ':';
url++; url++;
len = strlenW( port ); url += sprintfW( url, formatW, uc->nPort );
memcpy( url, port, len * sizeof(WCHAR) );
url += len;
} }
/* add slash between hostname and path if necessary */ /* add slash between hostname and path if necessary */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment