diff options
| author | Petr Rockai <prockai@redhat.com> | 2011-12-18 21:56:03 +0000 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2011-12-18 21:56:03 +0000 |
| commit | 845b1df617f203b93ba1451b7e528953cf185c65 (patch) | |
| tree | d08785b38cdf932f803670ed06c739698767045e /lib/format_text | |
| parent | 32e53e506d57b1e473c95455dc18e50bbdd88231 (diff) | |
| download | lvm2-845b1df617f203b93ba1451b7e528953cf185c65.tar.gz lvm2-845b1df617f203b93ba1451b7e528953cf185c65.tar.xz lvm2-845b1df617f203b93ba1451b7e528953cf185c65.zip | |
Make a cleaner split between config tree and config file functionality. Move
the latter out of libdm.
Diffstat (limited to 'lib/format_text')
| -rw-r--r-- | lib/format_text/import.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/format_text/import.c b/lib/format_text/import.c index 4b347cc8..ff90a3dc 100644 --- a/lib/format_text/import.c +++ b/lib/format_text/import.c @@ -49,12 +49,12 @@ const char *text_vgname_import(const struct format_type *fmt, _init_text_import(); - if (!(cft = dm_config_create(NULL, 0))) + if (!(cft = config_file_open(NULL, 0))) return_NULL; - if ((!dev && !read_config_file(cft)) || - (dev && !read_config_fd(cft, dev, offset, size, - offset2, size2, checksum_fn, checksum))) + if ((!dev && !config_file_read(cft)) || + (dev && !config_file_read_fd(cft, dev, offset, size, + offset2, size2, checksum_fn, checksum))) goto_out; /* @@ -72,7 +72,7 @@ const char *text_vgname_import(const struct format_type *fmt, } out: - destroy_config_tree(cft); + config_file_destroy(cft); return vgname; } @@ -94,12 +94,12 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, *desc = NULL; *when = 0; - if (!(cft = dm_config_create(file, 0))) + if (!(cft = config_file_open(file, 0))) return_NULL; - if ((!dev && !read_config_file(cft)) || - (dev && !read_config_fd(cft, dev, offset, size, - offset2, size2, checksum_fn, checksum))) { + if ((!dev && !config_file_read(cft)) || + (dev && !config_file_read_fd(cft, dev, offset, size, + offset2, size2, checksum_fn, checksum))) { log_error("Couldn't read volume group metadata."); goto out; } @@ -119,7 +119,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, } out: - destroy_config_tree(cft); + config_file_destroy(cft); return vg; } |