shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

toolcontext: reuse destroy_config_context

Browse Source 
Call existing destroy_config_context() to destroy
some parts of cmd_context.
This commit is contained in:
Zdenek Kabelac 2021-12-10 20:51:46 +01:00
parent 09a4b56895
commit 26e6580dfb
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/commands/toolcontext.c
View File

@ -2041,8 +2041,6 @@ void destroy_toolcontext(struct cmd_context *cmd)
_destroy_segtypes(&cmd->segtypes); _destroy_segtypes(&cmd->segtypes);
_destroy_formats(cmd, &cmd->formats); _destroy_formats(cmd, &cmd->formats);
_destroy_filters(cmd); _destroy_filters(cmd);
if (cmd->mem)
dm_pool_destroy(cmd->mem);
devices_file_exit(cmd); devices_file_exit(cmd);
dev_cache_exit(); dev_cache_exit();
_destroy_dev_types(cmd); _destroy_dev_types(cmd);
@ -2050,16 +2048,10 @@ void destroy_toolcontext(struct cmd_context *cmd)
if ((cft_cmdline = remove_config_tree_by_source(cmd, CONFIG_STRING))) if ((cft_cmdline = remove_config_tree_by_source(cmd, CONFIG_STRING)))
config_destroy(cft_cmdline); config_destroy(cft_cmdline);
_destroy_config(cmd);
if (cmd->cft_def_hash) if (cmd->cft_def_hash)
dm_hash_destroy(cmd->cft_def_hash); dm_hash_destroy(cmd->cft_def_hash);
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
if (cmd->pending_delete_mem)
dm_pool_destroy(cmd->pending_delete_mem);
#ifndef VALGRIND_POOL #ifndef VALGRIND_POOL
if (cmd->linebuffer) { if (cmd->linebuffer) {
/* Reset stream buffering to defaults */ /* Reset stream buffering to defaults */
@ -2084,7 +2076,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
free(cmd->linebuffer); free(cmd->linebuffer);
} }
#endif #endif
free(cmd); destroy_config_context(cmd);
lvmpolld_disconnect(); lvmpolld_disconnect();