thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autovivification leading to extra empty keys in pool-create

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-04-20 02:04:09 +03:00
parent 87f666d2a2
commit 3094358ec2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli_pool_create.cpp
+8 -4
View File
@@ -14,7 +14,7 @@
struct pool_creator_t struct pool_creator_t
{ {
cli_tool_t *parent; cli_tool_t *parent;
json11::Json::object cfg; json11::Json cfg;
bool force = false; bool force = false;
bool wait = false; bool wait = false;
@@ -55,8 +55,12 @@ struct pool_creator_t
goto resume_8; goto resume_8;
// Validate pool parameters // Validate pool parameters
result.text = validate_pool_config(cfg, json11::Json(), parent->cli->st_cli.global_block_size, {
parent->cli->st_cli.global_bitmap_granularity, force); auto new_cfg = cfg.object_items();
result.text = validate_pool_config(new_cfg, json11::Json(), parent->cli->st_cli.global_block_size,
parent->cli->st_cli.global_bitmap_granularity, force);
cfg = new_cfg;
}
if (result.text != "") if (result.text != "")
{ {
result.err = EINVAL; result.err = EINVAL;
@@ -605,7 +609,7 @@ std::function<bool(cli_result_t &)> cli_tool_t::start_pool_create(json11::Json c
{ {
auto pool_creator = new pool_creator_t(); auto pool_creator = new pool_creator_t();
pool_creator->parent = this; pool_creator->parent = this;
pool_creator->cfg = cfg.object_items(); pool_creator->cfg = cfg;
pool_creator->force = cfg["force"].bool_value(); pool_creator->force = cfg["force"].bool_value();
pool_creator->wait = cfg["wait"].bool_value(); pool_creator->wait = cfg["wait"].bool_value();
return [pool_creator](cli_result_t & result) return [pool_creator](cli_result_t & result)