roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-29 13:27:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: some clean-ups

Browse Source
This commit is contained in:
3lswear
2022-02-19 18:43:40 +03:00
parent 05413833ea
commit e9dc59ca98
1 changed files with 46 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/config/parse.cpp
View File

@@ -66,45 +66,40 @@ namespace config
{ {
case toml_node::STRING: case toml_node::STRING:
{ {
DBOUT << "cleaning string" << ENDL; // DBOUT << "cleaning string" << ENDL;
delete node->getString(); delete node->getString();
} }
break; break;
case toml_node::MAPARRAY: case toml_node::MAPARRAY:
{ {
DBOUT << "cleaning MAPARRAY" << ENDL; // DBOUT << "cleaning MAPARRAY" << ENDL;
TOMLMapArray *map_array = node->getMapArray(); TOMLMapArray *map_array = node->getMapArray();
for (TOMLMapArray::iterator it = map_array->begin(); for (TOMLMapArray::iterator it = map_array->begin();
it != map_array->end(); ++it) it != map_array->end(); ++it)
{ {
DBOUT << "cleaning a MAP of MAPARRAY" << ENDL; // DBOUT << "cleaning a MAP of MAPARRAY" << ENDL;
TOMLMap *map = *it; TOMLMap *map = *it;
TOMLMap::iterator map_it = map->begin(); TOMLMap::iterator map_it = map->begin();
for (map_it = map->begin(); for (map_it = map->begin();
map_it != map->end(); ++map_it) map_it != map->end(); ++map_it)
{ {
DBOUT << "cleaning a MAP item " << map_it->first << ENDL; // DBOUT << "cleaning a MAP item " << map_it->first << ENDL;
config::clean_generic(map_it->second); config::clean_generic(map_it->second);
/* map->erase(map_it); */
} }
map->clear(); map->clear();
delete map; delete map;
} }
map_array->clear(); map_array->clear();
delete map_array; delete map_array;
DBOUT << "end cleaning MAPARRAY" << ENDL; // DBOUT << "end cleaning MAPARRAY" << ENDL;
} }
break; break;
case toml_node::MAP: case toml_node::MAP:
{ {
DBOUT << "cleaning MAP" << ENDL; // DBOUT << "cleaning MAP" << ENDL;
TOMLMap *map = node->getMap(); TOMLMap *map = node->getMap();
for (TOMLMap::iterator it = map->begin(); it != map->end(); ++it) for (TOMLMap::iterator it = map->begin(); it != map->end(); ++it)
{
DBOUT << "key is " << it->first << ENDL;
config::clean_generic(it->second); config::clean_generic(it->second);
/* map->erase(it); */
}
map->clear(); map->clear();
delete map; delete map;
} }
@@ -116,9 +111,7 @@ namespace config
TOMLArray *arr = node->getArray(); TOMLArray *arr = node->getArray();
for (TOMLArray::iterator it = arr->begin(); for (TOMLArray::iterator it = arr->begin();
it != arr->end(); ++it) it != arr->end(); ++it)
{
config::clean_generic(*it); config::clean_generic(*it);
}
arr->clear(); arr->clear();
delete arr; delete arr;
DBOUT << "end cleaning MAP" << ENDL; DBOUT << "end cleaning MAP" << ENDL;
@@ -127,7 +120,7 @@ namespace config
default: default:
{ {
DBOUT << "Cleaning type " << node->type << " not implemented :)" << ENDL; // DBOUT << "Cleaning type " << node->type << " not implemented :)" << ENDL;
} }
} }
delete node; delete node;