aboutsummaryrefslogtreecommitdiff
path: root/src/engine/logging.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-07-31 17:06:35 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-08-09 10:33:49 -0600
commitd21eed76c48960707561c45c492c10a6a23c052e (patch)
treeebab09d099a699a24801fcfb4d7152cf82cc4a06 /src/engine/logging.cpp
parentad80d6dc10f9bd6cb6a084857a8fb546cc55e756 (diff)
downloadwix-d21eed76c48960707561c45c492c10a6a23c052e.tar.gz
wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.bz2
wix-d21eed76c48960707561c45c492c10a6a23c052e.zip
WIXFEAT:4763 Change "string" variable type to literal and add "formatted".
Diffstat (limited to 'src/engine/logging.cpp')
-rw-r--r--src/engine/logging.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/logging.cpp b/src/engine/logging.cpp
index 818532ad..55b65336 100644
--- a/src/engine/logging.cpp
+++ b/src/engine/logging.cpp
@@ -149,7 +149,7 @@ extern "C" HRESULT LoggingOpen(
149 149
150 if (pLog->sczPathVariable && *pLog->sczPathVariable) 150 if (pLog->sczPathVariable && *pLog->sczPathVariable)
151 { 151 {
152 VariableSetString(pVariables, pLog->sczPathVariable, pLog->sczPath, FALSE); // Ignore failure. 152 VariableSetString(pVariables, pLog->sczPathVariable, pLog->sczPath, FALSE, FALSE); // Ignore failure.
153 } 153 }
154 } 154 }
155 155
@@ -220,7 +220,7 @@ extern "C" HRESULT LoggingSetPackageVariable(
220 hr = StrAllocFormatted(&sczLogPath, L"%ls%hs%ls_%03u_%ls%ls.%ls", pLog->sczPrefix, wzSuffix && *wzSuffix ? "_" : "", wzSuffix && *wzSuffix ? wzSuffix : L"", vdwPackageSequence, pPackage->sczId, fRollback ? L"_rollback" : L"", pLog->sczExtension); 220 hr = StrAllocFormatted(&sczLogPath, L"%ls%hs%ls_%03u_%ls%ls.%ls", pLog->sczPrefix, wzSuffix && *wzSuffix ? "_" : "", wzSuffix && *wzSuffix ? wzSuffix : L"", vdwPackageSequence, pPackage->sczId, fRollback ? L"_rollback" : L"", pLog->sczExtension);
221 ExitOnFailure(hr, "Failed to allocate path for package log."); 221 ExitOnFailure(hr, "Failed to allocate path for package log.");
222 222
223 hr = VariableSetString(pVariables, fRollback ? pPackage->sczRollbackLogPathVariable : pPackage->sczLogPathVariable, sczLogPath, FALSE); 223 hr = VariableSetString(pVariables, fRollback ? pPackage->sczRollbackLogPathVariable : pPackage->sczLogPathVariable, sczLogPath, FALSE, FALSE);
224 ExitOnFailure(hr, "Failed to set log path into variable."); 224 ExitOnFailure(hr, "Failed to set log path into variable.");
225 225
226 if (psczLogPath) 226 if (psczLogPath)