Added is_type policy function #5691
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Signed-off-by: Victor Moene <[email protected]> Changelog: Added is_type policy function to check type of a variable. Ticket: CFE-3641
victormlg
force-pushed
the
CFE-3641-is_type
branch
from
f5a9349 to
e80fdd7
Compare
There was a problem hiding this comment.
Added some comments that you need to address. Otherwise, great work 🚀 Could you also make an acceptance test? This way we know for certain that it works, and that it continues working in the future. I'll help you get started if you haven't written one before 😉
libpromises/evalfunction.c
Outdated
| // parse type | ||
| const char* const type_arg_name = TrimWhitespace(RlistScalarValue(type_arg)); | ||
| const char* const regex = " "; | ||
| const Rlist *const first_arg = RlistFromRegexSplitNoOverflow(type_arg_name, regex, 2); |
There was a problem hiding this comment.
Using a regex for splitting a string on a white space character is a bit overkill. See if you can find an easier way to split the string. Also the RlistFromRegexSplitNoOverflow() function may return error. So make sure that it is handled gracefully. We don't want the program to crash if the user uses the function wrong. Instead we would want to print an error message and return failure.
libpromises/evalfunction.c
Outdated
| { | ||
| Log(LOG_LEVEL_ERR, "Function %s : invalid datatype", | ||
| fp->name); | ||
| return FnFailure(); |
There was a problem hiding this comment.
Is this an error? Should it not return FnReturnContext(false)?
Signed-off-by: Victor Moene <[email protected]>
| @@ -5276,38 +5276,21 @@ static FnCallResult FnCallFold(EvalContext *ctx, | |||
|
|
|||
| /*********************************************************************/ | |||
|
|
|||
| static FnCallResult FnCallDatatype(EvalContext *ctx, ARG_UNUSED const Policy *policy, const FnCall *fp, const Rlist *finalargs) | |||
| static const char * DataTypeStringFromVarName(EvalContext *ctx, const char *var_name, bool detail) | |||
There was a problem hiding this comment.
const char * commonly means / implies a string owned by something else, or in other words a string you don't need to free.
| { | ||
| detail = BooleanFromString(RlistScalarValue(finalargs->next)); | ||
| } | ||
| const char * const ouptput_string = DataTypeStringFromVarName(ctx, var_name, detail); |
| } | ||
| return StringConcatenate(2, "policy ", type_str); |
| } | ||
|
|
||
| return FnReturnF("%s %s", type_str, subtype_str); | ||
| return StringConcatenate(3, type_str, " ", subtype_str); |
| const char *const type_str = | ||
| (type == CF_DATA_TYPE_NONE) ? "none" : DataTypeToString(type); | ||
|
|
||
| if (!detail) | ||
| { | ||
| return FnReturn(type_str); | ||
| return type_str; |
There was a problem hiding this comment.
| return type_str; | |
| return StringDuplicate(type_str); |
| @@ -5276,38 +5276,21 @@ static FnCallResult FnCallFold(EvalContext *ctx, | |||
|
|
|||
| /*********************************************************************/ | |||
|
|
|||
| static FnCallResult FnCallDatatype(EvalContext *ctx, ARG_UNUSED const Policy *policy, const FnCall *fp, const Rlist *finalargs) | |||
| static const char * DataTypeStringFromVarName(EvalContext *ctx, const char *var_name, bool detail) | |||
There was a problem hiding this comment.
| static const char * DataTypeStringFromVarName(EvalContext *ctx, const char *var_name, bool detail) | |
| static char * DataTypeStringFromVarName(EvalContext *ctx, const char *var_name, bool detail) |
| { | ||
| detail = BooleanFromString(RlistScalarValue(finalargs->next)); | ||
| } | ||
| const char * const ouptput_string = DataTypeStringFromVarName(ctx, var_name, detail); |
There was a problem hiding this comment.
| const char * const ouptput_string = DataTypeStringFromVarName(ctx, var_name, detail); | |
| char * const ouptput_string = DataTypeStringFromVarName(ctx, var_name, detail); |
| return FnFailure(); | ||
| } | ||
|
|
||
| return FnReturnF("%s", ouptput_string); |
There was a problem hiding this comment.
This is how you can "give" it to the caller, and it's their job to free it.
| return FnReturnF("%s", ouptput_string); | |
| return FnReturnNoCopy(output_string); |
| detail = true; | ||
| } | ||
| } | ||
| const char * const type_string = DataTypeStringFromVarName(ctx, var_name, detail); |
| detail = true; | ||
| } | ||
| } | ||
| const char * const type_string = DataTypeStringFromVarName(ctx, var_name, detail); |
There was a problem hiding this comment.
| const char * const type_string = DataTypeStringFromVarName(ctx, var_name, detail); | |
| char * const type_string = DataTypeStringFromVarName(ctx, var_name, detail); |
|
|
||
| return FnReturnContext(StringEqual(type_name, type_string)); |
There was a problem hiding this comment.
| return FnReturnContext(StringEqual(type_name, type_string)); | |
| const bool matching = StringEqual(type_name, type_string); | |
| free(type_string); | |
| return FnReturnContext(matching); |
Changelog: Added is_type policy function to check type of a variable.
Ticket: CFE-3641