Merge tag 'kbuild-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-block.git] / scripts / unifdef.c

diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index db00e3e30a59d77cf89b2793445e3f8901cc4577..ff15efd6e7d749e8ef515a7051770b7dff07b656 100644 (file)
--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -203,7 +203,7 @@ static int              depth;                      /* current #if nesting */
 static int              delcount;              /* count of deleted lines */
 static unsigned         blankcount;            /* count of blank lines */
 static unsigned         blankmax;              /* maximum recent blankcount */
-static bool             constexpr;             /* constant #if expression */
+static bool             constexpression;       /* constant #if expression */
 static bool             zerosyms = true;       /* to format symdepth output */
 static bool             firstsym;              /* ditto */
 
@@ -819,7 +819,7 @@ static const struct ops {
 /*
  * Function for evaluating the innermost parts of expressions,
  * viz. !expr (expr) number defined(symbol) symbol
- * We reset the constexpr flag in the last two cases.
+ * We reset the constexpression flag in the last two cases.
  */
 static Linetype
 eval_unary(const struct ops *ops, int *valp, const char **cpp)
@@ -877,7 +877,7 @@ eval_unary(const struct ops *ops, int *valp, const char **cpp)
                cp = skipcomment(cp);
                if (defparen && *cp++ != ')')
                        return (LT_ERROR);
-               constexpr = false;
+               constexpression = false;
        } else if (!endsym(*cp)) {
                debug("eval%d symbol", ops - eval_ops);
                sym = findsym(cp);
@@ -895,7 +895,7 @@ eval_unary(const struct ops *ops, int *valp, const char **cpp)
                        lt = *valp ? LT_TRUE : LT_FALSE;
                        cp = skipargs(cp);
                }
-               constexpr = false;
+               constexpression = false;
        } else {
                debug("eval%d bad expr", ops - eval_ops);
                return (LT_ERROR);
@@ -955,10 +955,10 @@ ifeval(const char **cpp)
        int val = 0;
 
        debug("eval %s", *cpp);
-       constexpr = killconsts ? false : true;
+       constexpression = killconsts ? false : true;
        ret = eval_table(eval_ops, &val, cpp);
        debug("eval = %d", val);
-       return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
+       return (constexpression ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
 }
 
 /*