Renamed no-malloc-fail to no-malloc-may-fail to mirror malloc-may-fail

Author: Enrico Steffinlongo

doc/man/cbmc.1

@@ -102,8 +102,8 @@ do not check that all pointers in pointer primitives are valid or null
 \fB\-\-no\-signed\-overflow\-check\fR
 disable signed arithmetic over\- and underflow checks
 .TP
-\fB\-\-no\-malloc\-fail\fR
-Do not allow malloc calls to fail by default.
+\fB\-\-no\-malloc\-may\-fail\fR
+do not allow malloc calls to fail by default
 .TP
 \fB\-\-no\-unwinding\-assertions\fR (\fBcbmc\fR\-only)
 do not generate unwinding assertions (cannot be

doc/man/goto-analyzer.1

@@ -634,8 +634,8 @@ do not check that all pointers in pointer primitives are valid or null
 \fB\-\-no\-signed\-overflow\-check\fR
 disable signed arithmetic over\- and underflow checks
 .TP
-\fB\-\-no\-malloc\-fail\fR
-Do not allow malloc calls to fail by default.
+\fB\-\-no\-malloc\-may\-fail\fR
+do not allow malloc calls to fail by default
 .TP
 \fB\-\-no\-unwinding\-assertions\fR (\fBcbmc\fR\-only)
 do not generate unwinding assertions (cannot be

doc/man/goto-instrument.1

@@ -697,8 +697,8 @@ set malloc failure mode to assert\-then\-assume
 \fB\-\-malloc\-fail\-null\fR
 set malloc failure mode to return null
 .TP
-\fB\-\-no\-malloc\-fail\fR
-Do not allow malloc calls to fail by default.
+\fB\-\-no\-malloc\-may\-fail\fR
+do not allow malloc calls to fail by default
 .TP
 \fB\-\-string\-abstraction\fR
 track C string lengths and zero\-termination

src/util/config.cpp

@@ -1130,7 +1130,7 @@ bool configt::set(const cmdlinet &cmdline)
   {
     ansi_c.malloc_may_fail = true;
   }
-  if(cmdline.isset("no-malloc-fail"))
+  if(cmdline.isset("no-malloc-may-fail"))
   {
     ansi_c.malloc_may_fail = false;
     ansi_c.malloc_failure_mode = ansi_ct::malloc_failure_mode_none;

src/util/config.h

@@ -70,15 +70,16 @@ class symbol_table_baset;
     " {y--no-library} \t disable built-in abstract C library\n"
 
 #define OPT_CONFIG_LIBRARY                                                     \
-  "(malloc-fail-assert)(malloc-fail-null)(malloc-may-fail)(no-malloc-fail)"    \
+  "(malloc-fail-assert)(malloc-fail-null)(malloc-may-fail)"                    \
+  "(no-malloc-may-fail)"                                                       \
   "(string-abstraction)"
 
 #define HELP_CONFIG_LIBRARY                                                    \
   " {y--malloc-may-fail} \t allow malloc calls to return a null pointer\n"     \
+  " {y--no-malloc-may-fail} \t disable potential malloc failure\n"             \
   " {y--malloc-fail-assert} \t "                                               \
   "set malloc failure mode to assert-then-assume\n"                            \
   " {y--malloc-fail-null} \t set malloc failure mode to return null\n"         \
-  " {y--no-malloc-fail} \t Disable potential malloc failure.\n"                \
   " {y--string-abstraction} \t track C string lengths and zero-termination\n"
 
 #define OPT_CONFIG_JAVA "(classpath)(cp)(main-class)"