소스 검색

Fix style warning in cmsystemtools, cosmetic change to ctest code

Zach Mullen 16 년 전
부모
커밋
9f105a3f6d
2개의 변경된 파일4개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 5
      Source/CTest/cmCTestMultiProcessHandler.cxx
  2. 2 1
      Source/cmSystemTools.cxx

+ 2 - 5
Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -407,12 +407,9 @@ void cmCTestMultiProcessHandler::CheckResume()
       fin.close();
       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());
     }
     }
 }
 }
 
 

+ 2 - 1
Source/cmSystemTools.cxx

@@ -1910,7 +1910,8 @@ list_item_verbose(FILE *out, struct archive_entry *entry)
   tim = archive_entry_mtime(entry);
   tim = archive_entry_mtime(entry);
 #define HALF_YEAR (time_t)365 * 86400 / 2
 #define HALF_YEAR (time_t)365 * 86400 / 2
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #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
 #else
 #define DAY_FMT  "%e"  /* Day number without leading zeros */
 #define DAY_FMT  "%e"  /* Day number without leading zeros */
 #endif
 #endif