Commit db497bdc authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard

cabinet: Simplify concatenation of path and filename.

parent 56c0151f
...@@ -2479,7 +2479,6 @@ BOOL __cdecl FDICopy( ...@@ -2479,7 +2479,6 @@ BOOL __cdecl FDICopy(
FDICABINETINFO fdici; FDICABINETINFO fdici;
FDINOTIFICATION fdin; FDINOTIFICATION fdin;
INT_PTR cabhf, filehf = 0; INT_PTR cabhf, filehf = 0;
int idx;
unsigned int i; unsigned int i;
char fullpath[MAX_PATH]; char fullpath[MAX_PATH];
size_t pathlen, filenamelen; size_t pathlen, filenamelen;
...@@ -2503,8 +2502,8 @@ BOOL __cdecl FDICopy( ...@@ -2503,8 +2502,8 @@ BOOL __cdecl FDICopy(
} }
ZeroMemory(decomp_state, sizeof(fdi_decomp_state)); ZeroMemory(decomp_state, sizeof(fdi_decomp_state));
pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; pathlen = pszCabPath ? strlen(pszCabPath) : 0;
filenamelen = (pszCabinet) ? strlen(pszCabinet) : 0; filenamelen = pszCabinet ? strlen(pszCabinet) : 0;
/* slight overestimation here to save CPU cycles in the developer's brain */ /* slight overestimation here to save CPU cycles in the developer's brain */
if ((pathlen + filenamelen + 3) > MAX_PATH) { if ((pathlen + filenamelen + 3) > MAX_PATH) {
...@@ -2515,12 +2514,11 @@ BOOL __cdecl FDICopy( ...@@ -2515,12 +2514,11 @@ BOOL __cdecl FDICopy(
} }
/* paste the path and filename together */ /* paste the path and filename together */
idx = 0; fullpath[0] = '\0';
if (pathlen) { if (pathlen)
for (i = 0; i < pathlen; i++) fullpath[idx++] = pszCabPath[i]; strcpy(fullpath, pszCabPath);
} if (filenamelen)
if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = pszCabinet[i]; strcat(fullpath, pszCabinet);
fullpath[idx] = '\0';
TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); TRACE("full cab path/file name: %s\n", debugstr_a(fullpath));
...@@ -2540,7 +2538,7 @@ BOOL __cdecl FDICopy( ...@@ -2540,7 +2538,7 @@ BOOL __cdecl FDICopy(
fdi->close(cabhf); fdi->close(cabhf);
return FALSE; return FALSE;
} }
/* cabinet notification */ /* cabinet notification */
ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); ZeroMemory(&fdin, sizeof(FDINOTIFICATION));
fdin.setID = fdici.setID; fdin.setID = fdici.setID;
......
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