Skip to content

Respect ST_FLAG_IMMUTABLE in dstate_delinfo() #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 2 commits into from
Oct 7, 2020
Merged

Respect ST_FLAG_IMMUTABLE in dstate_delinfo() #795

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dfef01
Respect `ST_FLAG_IMMUTABLE` in `dstate_delinfo()`
flobernd Jun 15, 2020
f5ffd24
state.c: state_delinfo(): comment on immutables
jimklimov Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion common/state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ static void st_tree_node_add(st_tree_t **nptr, st_tree_t *sptr)
*nptr = sptr;
}

/* remove a variable from a tree */
/* remove a variable from a tree
* except for variables with ST_FLAG_IMMUTABLE
* (for override.* to survive) per issue #737
*/
int state_delinfo(st_tree_t **nptr, const char *var)
{
while (*nptr) {
Expand All @@ -141,6 +144,11 @@ int state_delinfo(st_tree_t **nptr, const char *var)
continue;
}

if (node->flags & ST_FLAG_IMMUTABLE) {
upsdebugx(6, "%s: not deleting immutable variable [%s]", __func__, var);
return 0;
}

/* whatever is on the left, hang it off current right */
st_tree_node_add(&node->right, node->left);

Expand Down