mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: remove alloc_filter_preset() and free_filter_preset()

Browse source 
All users of that are now C++ and don't need these helpers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-01 22:44:45 +01:00 • committed by Michael Keller
parent cf7c54bd56
commit 92a1a08b21
6 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/parse.cpp
View file

@ -24,7 +24,6 @@ parser_state::~parser_state()
free_dive(cur_dive);
free_trip(cur_trip);
free_dive_site(cur_dive_site);
free_filter_preset(cur_filter);
free((void *)cur_extra_data.key);
free((void *)cur_extra_data.value);
}
@ -213,14 +212,13 @@ void filter_preset_start(struct parser_state *state)
{
if (state->cur_filter)
return;
state->cur_filter = alloc_filter_preset();
state->cur_filter = std::make_unique<filter_preset>();
}
void filter_preset_end(struct parser_state *state)
{
add_filter_preset_to_table(state->cur_filter, state->log->filter_presets);
free_filter_preset(state->cur_filter);
state->cur_filter = NULL;
add_filter_preset_to_table(state->cur_filter.get(), state->log->filter_presets);
state->cur_filter.reset();
}
void fulltext_start(struct parser_state *state)
@ -234,7 +232,7 @@ void fulltext_end(struct parser_state *state)
{
if (!state->in_fulltext)
return;
filter_preset_set_fulltext(state->cur_filter, state->fulltext.c_str(), state->fulltext_string_mode.c_str());
filter_preset_set_fulltext(state->cur_filter.get(), state->fulltext.c_str(), state->fulltext_string_mode.c_str());
state->fulltext.clear();
state->fulltext_string_mode.clear();
state->in_fulltext = false;
@ -251,7 +249,7 @@ void filter_constraint_end(struct parser_state *state)
{
if (!state->in_filter_constraint)
return;
filter_preset_add_constraint(state->cur_filter, state->filter_constraint_type.c_str(), state->filter_constraint_string_mode.c_str(),
filter_preset_add_constraint(state->cur_filter.get(), state->filter_constraint_type.c_str(), state->filter_constraint_string_mode.c_str(),
state->filter_constraint_range_mode.c_str(), state->filter_constraint_negate, state->filter_constraint.c_str());
state->filter_constraint_type.clear();