[wininet/ftp] Simplify FTP_FtpGetFileW a bit
Paul Vriens
paul.vriens.wine at gmail.com
Tue Mar 20 12:30:35 CDT 2007
Hi,
We can immediately return when we don't get a proper filehandle.
Changelog
Simplify FTP_FtpGetFileW a bit
Cheers,
Paul.
-------------- next part --------------
>From 627a5bf4dc0990de627f10cc3afcafb062a9be34 Mon Sep 17 00:00:00 2001
From: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Tue, 20 Mar 2007 18:29:08 +0100
Subject: [PATCH] Simplify FTP_FtpGetFileW a bit
---
dlls/wininet/ftp.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 7cb49e1..05f6b36 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1317,7 +1317,7 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile,
hFile = CreateFileW(lpszNewFile, GENERIC_WRITE, 0, 0, fFailIfExists ?
CREATE_NEW : CREATE_ALWAYS, dwLocalFlagsAttribute, 0);
if (INVALID_HANDLE_VALUE == hFile)
- goto lend;
+ return FALSE;
/* Set up socket to retrieve data */
nBytes = FTP_SendRetrieve(lpwfs, lpszRemoteFile, dwInternetFlags);
@@ -1345,12 +1345,10 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile,
}
}
-lend:
if (lpwfs->lstnSocket != -1)
closesocket(lpwfs->lstnSocket);
- if (INVALID_HANDLE_VALUE != hFile)
- CloseHandle(hFile);
+ CloseHandle(hFile);
hIC = lpwfs->lpAppInfo;
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
--
1.4.4.2
More information about the wine-patches
mailing list