Gerald Pfeifer : setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable.

Alexandre Julliard julliard at winehq.org
Wed Sep 8 13:32:10 CDT 2010


Module: wine
Branch: master
Commit: 053ba796e7dca37c0659c0f15a4589bccf2274c6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=053ba796e7dca37c0659c0f15a4589bccf2274c6

Author: Gerald Pfeifer <gerald at pfeifer.com>
Date:   Tue Sep  7 21:03:00 2010 +0200

setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable.

---

 dlls/setupx.dll16/virtcopy.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c
index ffb54f3..b80a5be 100644
--- a/dlls/setupx.dll16/virtcopy.c
+++ b/dlls/setupx.dll16/virtcopy.c
@@ -437,11 +437,11 @@ static RETERR16 VCP_CheckPaths(void)
 static RETERR16 VCP_CopyFiles(void)
 {
     char fn_src[MAX_PATH], fn_dst[MAX_PATH];
-    RETERR16 res = OK, cbres;
+    RETERR16 res = OK;
     DWORD n;
     LPVIRTNODE lpvn;
 
-    cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef);
+    VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef);
     for (n = 0; n < vn_num; n++)
     {
 	lpvn = pvnlist[n];
@@ -451,7 +451,7 @@ static RETERR16 VCP_CopyFiles(void)
         strcpy(fn_dst, VcpExplain16(lpvn, VCPEX_DST_FULL));
 	/* FIXME: what is this VCPM_VSTATWRITE here for ?
 	 * I guess it's to signal successful destination file creation */
-	cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef);
+	VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef);
 
 	/* FIXME: need to do the file copy in small chunks for notifications */
 	TRACE("copying '%s' to '%s'\n", fn_src, fn_dst);
@@ -464,12 +464,12 @@ static RETERR16 VCP_CopyFiles(void)
         }
 
 	vcp_status.prgFileRead.dwSoFar++;
-	cbres = VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef);
+	VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef);
 	vcp_status.prgFileWrite.dwSoFar++;
-	cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef);
+	VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef);
     }
 
-    cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef);
+    VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef);
     return res;
 }
 




More information about the wine-cvs mailing list