setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable.
Gerald Pfeifer
gerald at pfeifer.com
Tue Sep 7 14:03:00 CDT 2010
Based on the patch to this file that was accepted earlier this week,
this simplifies VCP_CheckPaths. No point in maintaining cbres when
it's never used.
Gerald
---
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 f79c390..1e50bc4 100644
--- a/dlls/setupx.dll16/virtcopy.c
+++ b/dlls/setupx.dll16/virtcopy.c
@@ -441,11 +441,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];
@@ -455,7 +455,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);
@@ -468,12 +468,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;
}
--
1.7.2.2
More information about the wine-patches
mailing list