1 files changed, 39 insertions, 26 deletions

diff --git a/miscutils/bc.c b/miscutils/bc.c
index 26ab94cbd..aa478e461 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -976,7 +976,20 @@ static void bc_verror_msg(const char *fmt, va_list p)
         }
 }
 
-static NOINLINE int bc_error_fmt(const char *fmt, ...)
+#if ENABLE_FEATURE_BC_SIGNALS
+# define ERRORFUNC       /*nothing*/
+# define ERROR_RETURN(a) a
+#else
+# if ENABLE_FEATURE_CLEAN_UP
+#  define ERRORFUNC       /*nothing*/
+#  define ERROR_RETURN(a) a
+# else
+#  define ERRORFUNC       NORETURN
+#  define ERROR_RETURN(a) /*nothing*/
+# endif
+#endif
+
+static NOINLINE ERRORFUNC int bc_error_fmt(const char *fmt, ...)
 {
         va_list p;
 
@@ -986,7 +999,7 @@ static NOINLINE int bc_error_fmt(const char *fmt, ...)
 
         if (!ENABLE_FEATURE_CLEAN_UP && !G_ttyin)
                 exit(1);
-        return BC_STATUS_FAILURE;
+        ERROR_RETURN(return BC_STATUS_FAILURE;)
 }
 
 #if ENABLE_BC
@@ -1016,52 +1029,52 @@ static NOINLINE int bc_posix_error_fmt(const char *fmt, ...)
 // function must not have caller-cleaned parameters on stack.
 // Unfortunately, vararg function API does exactly that on most arches.
 // Thus, use these shims for the cases when we have no vararg PARAMS:
-static int bc_error(const char *msg)
+static ERRORFUNC int bc_error(const char *msg)
 {
-        return bc_error_fmt("%s", msg);
+        ERROR_RETURN(return) bc_error_fmt("%s", msg);
 }
-#if ENABLE_BC
-static int bc_POSIX_requires(const char *msg)
+static ERRORFUNC int bc_error_bad_character(char c)
 {
-        return bc_posix_error_fmt("POSIX requires %s", msg);
+        ERROR_RETURN(return) bc_error_fmt("bad character '%c'", c);
 }
-static int bc_POSIX_does_not_allow(const char *msg)
+static ERRORFUNC int bc_error_bad_expression(void)
 {
-        return bc_posix_error_fmt("%s%s", "POSIX does not allow ", msg);
+        ERROR_RETURN(return) bc_error("bad expression");
 }
-static int bc_POSIX_does_not_allow_bool_ops_this_is_bad(const char *msg)
+static ERRORFUNC int bc_error_bad_token(void)
 {
-        return bc_posix_error_fmt("%s%s %s", "POSIX does not allow ", "boolean operators; the following is bad:", msg);
+        ERROR_RETURN(return) bc_error("bad token");
 }
-static int bc_POSIX_does_not_allow_empty_X_expression_in_for(const char *msg)
+static ERRORFUNC int bc_error_stack_has_too_few_elements(void)
 {
-        return bc_posix_error_fmt("%san empty %s expression in a for loop", "POSIX does not allow ", msg);
+        ERROR_RETURN(return) bc_error("stack has too few elements");
 }
-#endif
-static int bc_error_bad_character(char c)
+static ERRORFUNC int bc_error_variable_is_wrong_type(void)
 {
-        return bc_error_fmt("bad character '%c'", c);
+        ERROR_RETURN(return) bc_error("variable is wrong type");
 }
-static int bc_error_bad_expression(void)
+static ERRORFUNC int bc_error_nested_read_call(void)
 {
-        return bc_error("bad expression");
+        ERROR_RETURN(return) bc_error("read() call inside of a read() call");
 }
-static int bc_error_bad_token(void)
+#if ENABLE_BC
+static int bc_POSIX_requires(const char *msg)
 {
-        return bc_error("bad token");
+        return bc_posix_error_fmt("POSIX requires %s", msg);
 }
-static int bc_error_stack_has_too_few_elements(void)
+static int bc_POSIX_does_not_allow(const char *msg)
 {
-        return bc_error("stack has too few elements");
+        return bc_posix_error_fmt("%s%s", "POSIX does not allow ", msg);
 }
-static int bc_error_variable_is_wrong_type(void)
+static int bc_POSIX_does_not_allow_bool_ops_this_is_bad(const char *msg)
 {
-        return bc_error("variable is wrong type");
+        return bc_posix_error_fmt("%s%s %s", "POSIX does not allow ", "boolean operators; the following is bad:", msg);
 }
-static int bc_error_nested_read_call(void)
+static int bc_POSIX_does_not_allow_empty_X_expression_in_for(const char *msg)
 {
-        return bc_error("read() call inside of a read() call");
+        return bc_posix_error_fmt("%san empty %s expression in a for loop", "POSIX does not allow ", msg);
 }
+#endif
 
 static void bc_vec_grow(BcVec *v, size_t n)
 {