summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.cxx7
-rw-r--r--Source/cmSystemTools.cxx3
2 files changed, 4 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 984ed37..4b3d425 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -407,12 +407,9 @@ void cmCTestMultiProcessHandler::CheckResume()
fin.close();
}
}
- else
+ else if(cmSystemTools::FileExists(fname.c_str(), true))
{
- if(cmSystemTools::FileExists(fname.c_str(), true))
- {
- cmSystemTools::RemoveFile(fname.c_str());
- }
+ cmSystemTools::RemoveFile(fname.c_str());
}
}
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 9bd2c00..df8bfbf 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1910,7 +1910,8 @@ list_item_verbose(FILE *out, struct archive_entry *entry)
tim = archive_entry_mtime(entry);
#define HALF_YEAR (time_t)365 * 86400 / 2
#if defined(_WIN32) && !defined(__CYGWIN__)
-#define DAY_FMT "%d" /* Windows' strftime function does not support %e format. */
+ /* Windows' strftime function does not support %e format. */
+#define DAY_FMT "%d"
#else
#define DAY_FMT "%e" /* Day number without leading zeros */
#endif