llvm-cov: Follow LLVM naming conventions

This renames a few things that are using an unusual naming convention.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220929 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp
index eef4732c9c58cc04df4796df2a65ff1dccf83c2d..d6fe9d3471219918d4c057895daef352b65bc0c4 100644 (file)
--- a/tools/llvm-cov/CodeCoverage.cpp
+++ b/tools/llvm-cov/CodeCoverage.cpp
@@ -473,12 +473,12 @@ int CodeCoverageTool::report(int argc, const char **argv,
   return 0;
 }
 
   return 0;
 }
 

-int show_main(int argc, const char **argv) {
+int showMain(int argc, const char *argv[]) {

   CodeCoverageTool Tool;
   return Tool.run(CodeCoverageTool::Show, argc, argv);
 }
 
   CodeCoverageTool Tool;
   return Tool.run(CodeCoverageTool::Show, argc, argv);
 }
 

-int report_main(int argc, const char **argv) {
+int reportMain(int argc, const char *argv[]) {

   CodeCoverageTool Tool;
   return Tool.run(CodeCoverageTool::Report, argc, argv);
 }
   CodeCoverageTool Tool;
   return Tool.run(CodeCoverageTool::Report, argc, argv);
 }

diff --git a/tools/llvm-cov/TestingSupport.cpp b/tools/llvm-cov/TestingSupport.cpp
index 96417645f65a6365b7bd4cfc1dad1bbc14bdb993..aa07a79e78db369e44b3377981272f269799375b 100644 (file)
--- a/tools/llvm-cov/TestingSupport.cpp
+++ b/tools/llvm-cov/TestingSupport.cpp
@@ -21,7 +21,7 @@
 using namespace llvm;
 using namespace object;
 
 using namespace llvm;
 using namespace object;
 

-int convert_for_testing_main(int argc, const char **argv) {
+int convertForTestingMain(int argc, const char *argv[]) {

   sys::PrintStackTraceOnErrorSignal();
   PrettyStackTraceProgram X(argc, argv);
   llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
   sys::PrintStackTraceOnErrorSignal();
   PrettyStackTraceProgram X(argc, argv);
   llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.

diff --git a/tools/llvm-cov/gcov.cpp b/tools/llvm-cov/gcov.cpp
index bd493d25c97f46bd7df833e0cb93cb9e8f1abc72..4c9195a44b14655d80e75b1f2c3a6ddc952cc112 100644 (file)
--- a/tools/llvm-cov/gcov.cpp
+++ b/tools/llvm-cov/gcov.cpp
@@ -84,7 +84,7 @@ void reportCoverage(StringRef SourceFile, StringRef ObjectDir,
   FI.print(SourceFile, GCNO, GCDA);
 }
 
   FI.print(SourceFile, GCNO, GCDA);
 }
 

-int gcov_main(int argc, const char **argv) {
+int gcovMain(int argc, const char *argv[]) {

   // Print a stack trace if we signal out.
   sys::PrintStackTraceOnErrorSignal();
   PrettyStackTraceProgram X(argc, argv);
   // Print a stack trace if we signal out.
   sys::PrintStackTraceOnErrorSignal();
   PrettyStackTraceProgram X(argc, argv);

diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp
index 132c187ef9eb72f5291ac2656fb878bd96cd5151..a67859efba59a858332f48f7017c33c15491ca1d 100644 (file)
--- a/tools/llvm-cov/llvm-cov.cpp
+++ b/tools/llvm-cov/llvm-cov.cpp
@@ -20,19 +20,19 @@
 using namespace llvm;
 
 /// \brief The main entry point for the 'show' subcommand.
 using namespace llvm;
 
 /// \brief The main entry point for the 'show' subcommand.

-int show_main(int argc, const char **argv);
+int showMain(int argc, const char *argv[]);

 
 /// \brief The main entry point for the 'report' subcommand.
 
 /// \brief The main entry point for the 'report' subcommand.

-int report_main(int argc, const char **argv);
+int reportMain(int argc, const char *argv[]);

 
 /// \brief The main entry point for the 'convert-for-testing' subcommand.
 
 /// \brief The main entry point for the 'convert-for-testing' subcommand.

-int convert_for_testing_main(int argc, const char **argv);
+int convertForTestingMain(int argc, const char *argv[]);

 
 /// \brief The main entry point for the gcov compatible coverage tool.
 
 /// \brief The main entry point for the gcov compatible coverage tool.

-int gcov_main(int argc, const char **argv);
+int gcovMain(int argc, const char *argv[]);

 
 /// \brief Top level help.
 
 /// \brief Top level help.

-int help_main(int argc, const char **argv) {
+int helpMain(int argc, const char *argv[]) {

   errs() << "OVERVIEW: LLVM code coverage tool\n\n"
          << "USAGE: llvm-cov {gcov|report|show}\n";
   return 0;
   errs() << "OVERVIEW: LLVM code coverage tool\n\n"
          << "USAGE: llvm-cov {gcov|report|show}\n";
   return 0;


@@ -41,24 +41,23 @@ int help_main(int argc, const char **argv) {
 int main(int argc, const char **argv) {
   // If argv[0] is or ends with 'gcov', always be gcov compatible
   if (sys::path::stem(argv[0]).endswith_lower("gcov"))
 int main(int argc, const char **argv) {
   // If argv[0] is or ends with 'gcov', always be gcov compatible
   if (sys::path::stem(argv[0]).endswith_lower("gcov"))

-    return gcov_main(argc, argv);
+    return gcovMain(argc, argv);

 
   // Check if we are invoking a specific tool command.
   if (argc > 1) {
 
   // Check if we are invoking a specific tool command.
   if (argc > 1) {

-    typedef int (*MainFunction)(int, const char **);
-    MainFunction func =
-        StringSwitch<MainFunction>(argv[1])
-            .Case("convert-for-testing", convert_for_testing_main)
-            .Case("gcov", gcov_main)
-            .Case("report", report_main)
-            .Case("show", show_main)
-            .Cases("-h", "-help", "--help", help_main)
-            .Default(nullptr);
+    typedef int (*MainFunction)(int, const char *[]);
+    MainFunction Func = StringSwitch<MainFunction>(argv[1])
+                            .Case("convert-for-testing", convertForTestingMain)
+                            .Case("gcov", gcovMain)
+                            .Case("report", reportMain)
+                            .Case("show", showMain)
+                            .Cases("-h", "-help", "--help", helpMain)
+                            .Default(nullptr);

 
 

-    if (func) {
+    if (Func) {

       std::string Invocation = std::string(argv[0]) + " " + argv[1];
       argv[1] = Invocation.c_str();
       std::string Invocation = std::string(argv[0]) + " " + argv[1];
       argv[1] = Invocation.c_str();

-      return func(argc - 1, argv + 1);
+      return Func(argc - 1, argv + 1);

     }
   }
 
     }
   }
 


@@ -75,5 +74,5 @@ int main(int argc, const char **argv) {
   errs().resetColor();
   errs() << "\n";
 
   errs().resetColor();
   errs() << "\n";
 

-  return gcov_main(argc, argv);
+  return gcovMain(argc, argv);

 }
 }