commit 1a4dcefd7de18f69cb42447bec78ef99b0ed96f8
author Matthew Barth <msbarth@us.ibm.com> Tue Oct 26 15:35:48 2021 -0500
committer Matthew Barth <msbarth@linux.ibm.com> Wed Nov 03 20:43:22 2021 +0000
tree 3e0d760b4b0a13a2ada239c4e850584b63b98991
parent 09b09e5739bceab76a1a482cec9d89b980e0812d

control:fanctl: `dump` option only for JSON

Only show the `dump` option when the use of JSON is enabled. There is no
support for creating a fan control dump of the flight recorder, etc.. in
YAML based fan control configurations.

Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Change-Id: I7602fb4f45441058831a023a8d62dbecaf94574b

control/fanctl.cpp

diff --git a/control/fanctl.cpp b/control/fanctl.cpp
index 909ea0e..cd37ca4 100644
--- a/control/fanctl.cpp
+++ b/control/fanctl.cpp
@@ -672,6 +672,7 @@
     cmdResume->set_help_flag("-h, --help", strHelp);
     cmdResume->require_option(0);
 
+#ifdef CONTROL_USE_JSON
     // Dump method
     auto cmdDump = commands->add_subcommand(
         "dump", "Dump the FlightRecorder diagnostic log");
@@ -679,7 +680,7 @@
                            "Dump the FlightRecorder diagnostic log");
     cmdDump->require_option(0);
 
-#ifdef CONTROL_USE_JSON
+    // Query dump
     auto cmdDumpQuery =
         commands->add_subcommand("query_dump", "Query the dump file");
 
@@ -736,11 +737,11 @@
         {
             status();
         }
+#ifdef CONTROL_USE_JSON
         else if (app.got_subcommand("dump"))
         {
             dumpFanControl();
         }
-#ifdef CONTROL_USE_JSON
         else if (app.got_subcommand("query_dump"))
         {
             queryDumpFile(dq);