diff options
Diffstat (limited to 'build/expression.c')
| -rw-r--r-- | build/expression.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/build/expression.c b/build/expression.c index 5ba366984..84400d41f 100644 --- a/build/expression.c +++ b/build/expression.c @@ -101,11 +101,14 @@ static void valueDump(const char *msg, Value v, FILE *fp) * Parser state. */ typedef struct _parseState { - /*@owned@*/ char *str; /*!< expression string */ - /*@dependent@*/ char *p; /*!< current position in expression string */ - int nextToken; /*!< current lookahead token */ - Value tokenValue; /*!< valid when TOK_INTEGER or TOK_STRING */ - Spec spec; /*!< spec file that we are parsing inside of */ +/*@owned@*/ + char *str; /*!< expression string */ +/*@dependent@*/ + char *p; /*!< current position in expression string */ + int nextToken; /*!< current lookahead token */ +/*@relnull@*/ + Value tokenValue; /*!< valid when TOK_INTEGER or TOK_STRING */ + Spec spec; /*!< spec file that we are parsing inside of */ } *ParseState; @@ -320,6 +323,7 @@ static int rdToken(ParseState state) } /*@=boundswrite@*/ +/*@null@*/ static Value doLogical(ParseState state) /*@globals rpmGlobalMacroContext @*/ /*@modifies state->nextToken, state->p, state->tokenValue, @@ -328,6 +332,7 @@ static Value doLogical(ParseState state) /** * @param state expression parser state */ +/*@null@*/ static Value doPrimary(ParseState state) /*@globals rpmGlobalMacroContext @*/ /*@modifies state->nextToken, state->p, state->tokenValue, @@ -409,6 +414,7 @@ static Value doPrimary(ParseState state) /** * @param state expression parser state */ +/*@null@*/ static Value doMultiplyDivide(ParseState state) /*@globals rpmGlobalMacroContext @*/ /*@modifies state->nextToken, state->p, state->tokenValue, @@ -464,6 +470,7 @@ static Value doMultiplyDivide(ParseState state) * @param state expression parser state */ /*@-boundswrite@*/ +/*@null@*/ static Value doAddSubtract(ParseState state) /*@globals rpmGlobalMacroContext @*/ /*@modifies state->nextToken, state->p, state->tokenValue, @@ -528,6 +535,7 @@ static Value doAddSubtract(ParseState state) /** * @param state expression parser state */ +/*@null@*/ static Value doRelational(ParseState state) /*@globals rpmGlobalMacroContext @*/ /*@modifies state->nextToken, state->p, state->tokenValue, |