From 3261f4d547843954ac211bc10b4423ca09872ca9 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 27 Apr 2018 19:24:38 +0000
Subject: [PATCH 1/2] Fix help output of --generate-function-body-options

---
 src/goto-programs/generate_function_bodies.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/goto-programs/generate_function_bodies.h b/src/goto-programs/generate_function_bodies.h
index 4801b6cc508..b106f700863 100644
--- a/src/goto-programs/generate_function_bodies.h
+++ b/src/goto-programs/generate_function_bodies.h
@@ -68,17 +68,21 @@ void generate_function_bodies(
   goto_modelt &model,
   message_handlert &message_handler);
 
+// clang-format off
 #define OPT_REPLACE_FUNCTION_BODY                                              \
   "(generate-function-body):"                                                  \
   "(generate-function-body-options):"
 
 #define HELP_REPLACE_FUNCTION_BODY                                             \
   " --generate-function-body <regex>\n"                                        \
-  "                              Generate bodies for functions matching regex" \
+  /* NOLINTNEXTLINE(whitespace/line_length) */ \
+  "                              Generate bodies for functions matching regex\n" \
   " --generate-function-body-options <option>\n"                               \
   "                              One of assert-false, assume-false,\n"         \
-  "                              nondet-return, assert-false-assume-false and" \
-  "                              \nhavoc[,params:<regex>][,globals:<regex>]\n" \
+  /* NOLINTNEXTLINE(whitespace/line_length) */ \
+  "                              nondet-return, assert-false-assume-false and\n" \
+  "                              havoc[,params:<regex>][,globals:<regex>]\n"   \
   "                              (default: nondet-return)"
+// clang-format on
 
 #endif // CPROVER_GOTO_PROGRAMS_GENERATE_FUNCTION_BODIES_H

From 05e4bc3404c0107f4e4fc45e7d011c726e254564 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 18 May 2018 09:53:50 +0100
Subject: [PATCH 2/2] Remove stray whitespace previously demanded by
 clang-format

---
 src/goto-programs/generate_function_bodies.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/goto-programs/generate_function_bodies.h b/src/goto-programs/generate_function_bodies.h
index b106f700863..61e818a1b7a 100644
--- a/src/goto-programs/generate_function_bodies.h
+++ b/src/goto-programs/generate_function_bodies.h
@@ -69,19 +69,19 @@ void generate_function_bodies(
   message_handlert &message_handler);
 
 // clang-format off
-#define OPT_REPLACE_FUNCTION_BODY                                              \
-  "(generate-function-body):"                                                  \
+#define OPT_REPLACE_FUNCTION_BODY \
+  "(generate-function-body):" \
   "(generate-function-body-options):"
 
-#define HELP_REPLACE_FUNCTION_BODY                                             \
-  " --generate-function-body <regex>\n"                                        \
+#define HELP_REPLACE_FUNCTION_BODY \
+  " --generate-function-body <regex>\n" \
   /* NOLINTNEXTLINE(whitespace/line_length) */ \
   "                              Generate bodies for functions matching regex\n" \
-  " --generate-function-body-options <option>\n"                               \
-  "                              One of assert-false, assume-false,\n"         \
+  " --generate-function-body-options <option>\n" \
+  "                              One of assert-false, assume-false,\n" \
   /* NOLINTNEXTLINE(whitespace/line_length) */ \
   "                              nondet-return, assert-false-assume-false and\n" \
-  "                              havoc[,params:<regex>][,globals:<regex>]\n"   \
+  "                              havoc[,params:<regex>][,globals:<regex>]\n" \
   "                              (default: nondet-return)"
 // clang-format on