Fix formatting issues in the --help output text

src/goto-checker/bmc_util.h

@@ -202,7 +202,7 @@ void run_property_decider(
 #define HELP_BMC \
   " --paths [strategy]           explore paths one at a time\n" \
   " --show-symex-strategies      list strategies for use with --paths\n" \
-  " --show-goto-symex-steps      show which steps symex travels, includes " \
+  " --show-goto-symex-steps      show which steps symex travels, includes\n" \
   "                              diagnostic information\n" \
   " --show-points-to-sets        show points-to sets for\n" \
   "                              pointer dereference. Requires --json-ui.\n" \
@@ -243,8 +243,7 @@ void run_property_decider(
   " --no-self-loops-to-assumptions\n" \
   "                              do not simplify while(1){} to assume(0)\n" \
   " --no-pretty-names            do not simplify identifiers\n" \
-  " --symex-complexity-limit N" \
-  "                              how complex (N) a path can become before\n" \
+  " --symex-complexity-limit N   how complex (N) a path can become before\n" \
   "                              symex abandons it. Currently uses guard\n" \
   "                              size to calculate complexity. \n" \
   " --symex-complexity-failed-child-loops-limit N\n" \

src/goto-diff/goto_diff_parse_options.cpp

@@ -329,6 +329,7 @@ void goto_diff_parse_optionst::help()
     "Program instrumentation options:\n"
     HELP_GOTO_CHECK
     HELP_COVER
+    "\n"
     "Other options:\n"
     " --version                    show version and exit\n"
     " --json-ui                    use JSON-formatted output\n"

src/goto-instrument/cover.h

@@ -35,7 +35,7 @@ class optionst;
   "                              (this is the default for --cover "            \
   "assertions)\n"                                                              \
   " --show-test-suite            print test suite for coverage criterion "     \
-  "(requires --cover)"
+  "(requires --cover)\n"
 
 enum class coverage_criteriont
 {

src/goto-instrument/replace_calls.h

@@ -48,6 +48,6 @@ class replace_callst
 #define OPT_REPLACE_CALLS "(replace-calls):"
 
 #define HELP_REPLACE_CALLS                                                     \
-  " --replace-calls f:g           replace calls to f with calls to g\n"
+  " --replace-calls f:g          replace calls to f with calls to g\n"
 
 #endif // CPROVER_GOTO_PROGRAMS_REPLACE_CALLS_H

src/goto-programs/remove_const_function_pointers.h

@@ -109,8 +109,9 @@ class remove_const_function_pointerst
 #define OPT_REMOVE_CONST_FUNCTION_POINTERS \
   "(remove-const-function-pointers)"
 
-#define HELP_REMOVE_CONST_FUNCTION_POINTERS \
-  " --remove-const-function-pointers    Remove function pointers that are constant or constant part of an array\n" // NOLINT(*)
-
+#define HELP_REMOVE_CONST_FUNCTION_POINTERS                                    \
+  " --remove-const-function-pointers\n"                                        \
+  "                              remove function pointers that are constant"   \
+  " or constant part of an array\n"
 
 #endif // CPROVER_GOTO_PROGRAMS_REMOVE_CONST_FUNCTION_POINTERS_H

src/goto-programs/restrict_function_pointers.h

@@ -40,15 +40,18 @@ Author: Diffblue Ltd.
   "(" RESTRICT_FUNCTION_POINTER_BY_NAME_OPT "):"
 
 #define HELP_RESTRICT_FUNCTION_POINTER                                         \
-  "--" RESTRICT_FUNCTION_POINTER_OPT                                           \
+  " --" RESTRICT_FUNCTION_POINTER_OPT                                          \
   " <pointer_name>/<target[,targets]*>\n"                                      \
-  "           restrict a function pointer to a set of possible targets\n"      \
-  "           targets must all exist in the symbol table with a matching "     \
-  "type\n"                                                                     \
-  "           works for globals and function parameters right now\n"           \
-  "--" RESTRICT_FUNCTION_POINTER_FROM_FILE_OPT                                 \
+  "                              restrict a function pointer to a set of "     \
+  "possible targets\n"                                                         \
+  "                              targets must all exist in the symbol table"   \
+  " with a matching type\n"                                                    \
+  "                              works for globals and function parameters"    \
+  " right now\n"                                                               \
+  " --" RESTRICT_FUNCTION_POINTER_FROM_FILE_OPT                                \
   " <file_name>\n"                                                             \
-  "           add function pointer restrictions from file"
+  "                              add function pointer restrictions from "      \
+  "file\n"
 
 void parse_function_pointer_restriction_options_from_cmdline(
   const cmdlinet &cmdline,

src/json/json_interface.h

@@ -43,8 +43,8 @@ void json_interface(cmdlinet &, message_handlert &);
   "(json-interface)"
 
 #define HELP_JSON_INTERFACE \
-  " --json-ui                     use JSON-formatted output\n" \
-  " --json-interface              bi-directional JSON interface\n"
+  " --json-ui                    use JSON-formatted output\n" \
+  " --json-interface             bi-directional JSON interface\n"
 // clang-format on
 
 #endif // CPROVER_JSON_JSON_INTERFACE_H