[packchk] refactored name and version (#1146) (#1968)

refactored name and version

Co-authored-by: Thorsten de Buhr <[email protected]>
Co-authored-by: Evgueni Driouk <[email protected]>

Author: 3 people

tools/packchk/src/PackChk.cpp

@@ -175,29 +175,21 @@ bool PackChk::CheckPackage()
 int PackChk::Check(int argc, const char* argv[], const char* envp[])
 {
   const string header = m_packOptions.GetHeader();
-  LogMsg("M001", TXT(header));
+  cout << header << endl;
 
   ParseOptions parseOptions(m_packOptions);
   ParseOptions::Result result = parseOptions.Parse(argc, argv);
 
-  // Add date and time to log file
-  if(!m_packOptions.GetLogPath().empty()) {
-    string dateTime = m_packOptions.GetCurrentDateTime();
-    LogMsg("M002", TXT("Log created on "), TXT2(dateTime));
-  }
-
   switch(result) {
     case ParseOptions::Result::Ok:
       break;
     case ParseOptions::Result::ExitNoError:
       return 0;
     case ParseOptions::Result::Error:
-      if(!ErrLog::Get()->GetErrCnt()) {
-        LogMsg("M105");
-      }
       return 1;
   }
 
+  LogMsg("M001", TXT(header));
   bool bOk = CheckPackage();
 
   if(ErrLog::Get()->GetErrCnt() || !bOk) {

tools/packchk/src/PackOptions.cpp

@@ -340,7 +340,7 @@ bool CPackOptions::SetDisableValidation(bool bDisable)
 */
 const string CPackOptions::GetVersionInfo()
 {
-  return ORIGINAL_FILENAME + string(" ") + VERSION_STRING + " " + COPYRIGHT_NOTICE;
+  return VERSION_STRING;
 }
 
 /**
@@ -360,14 +360,7 @@ const string CPackOptions::GetVersion()
 */
 const string CPackOptions::GetHeader()
 {
-  string header = string(PRODUCT_NAME);
-  header += " ";
-  header += GetVersion();
-  header += " ";
-  header += string(COPYRIGHT_NOTICE);
-  header += "\n";
-
-  return header;
+  return ORIGINAL_FILENAME + string(" ") + VERSION_STRING + " " + COPYRIGHT_NOTICE;
 }
 
 /**

tools/packchk/src/ParseOptions.cpp

@@ -193,13 +193,12 @@ bool ParseOptions::SetDisableValidation(bool bDisable)
  */
 ParseOptions::Result ParseOptions::Parse(int argc, const char* argv[])
 {
-  const string header = m_packOptions.GetHeader();
   const string fileName = m_packOptions.GetProgramName();
   bool bOk = true;
   cxxopts::ParseResult parseResult;
 
   try {
-    cxxopts::Options options(fileName, header);
+    cxxopts::Options options(fileName);
 
     options
       .set_width(80)