diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dumpconfig.c | 2 | ||||
| -rw-r--r-- | tools/pvchange.c | 2 | ||||
| -rw-r--r-- | tools/pvck.c | 2 | ||||
| -rw-r--r-- | tools/pvcreate.c | 2 | ||||
| -rw-r--r-- | tools/pvmove.c | 2 | ||||
| -rw-r--r-- | tools/pvremove.c | 2 | ||||
| -rw-r--r-- | tools/toollib.c | 4 | ||||
| -rw-r--r-- | tools/vgsplit.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c index 981147c5..c3f664a1 100644 --- a/tools/dumpconfig.c +++ b/tools/dumpconfig.c @@ -19,7 +19,7 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv) { const char *file = arg_str_value(cmd, file_ARG, NULL); - if (!write_config_file(cmd->cft, file, argc, argv)) { + if (!dm_config_write(cmd->cft, file, argc, argv)) { stack; return ECMD_FAILED; } diff --git a/tools/pvchange.c b/tools/pvchange.c index 990d0f21..f6d1abd3 100644 --- a/tools/pvchange.c +++ b/tools/pvchange.c @@ -209,7 +209,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) log_verbose("Using physical volume(s) on command line"); for (; opt < argc; opt++) { pv_name = argv[opt]; - unescape_colons_and_at_signs(pv_name, NULL, NULL); + dm_unescape_colons_and_at_signs(pv_name, NULL, NULL); vg_name = find_vgname_from_pvname(cmd, pv_name); if (!vg_name) { log_error("Failed to read physical volume %s", diff --git a/tools/pvck.c b/tools/pvck.c index 2ec75976..e45e77af 100644 --- a/tools/pvck.c +++ b/tools/pvck.c @@ -31,7 +31,7 @@ int pvck(struct cmd_context *cmd, int argc, char **argv) /* FIXME: warning and/or check if in use? */ log_verbose("Scanning %s", argv[i]); - unescape_colons_and_at_signs(argv[i], NULL, NULL); + dm_unescape_colons_and_at_signs(argv[i], NULL, NULL); pv_analyze(cmd, argv[i], arg_uint64_value(cmd, labelsector_ARG, UINT64_C(0))); diff --git a/tools/pvcreate.c b/tools/pvcreate.c index 7b50f70c..da3862d5 100644 --- a/tools/pvcreate.c +++ b/tools/pvcreate.c @@ -110,7 +110,7 @@ int pvcreate(struct cmd_context *cmd, int argc, char **argv) return ECMD_FAILED; } - unescape_colons_and_at_signs(argv[i], NULL, NULL); + dm_unescape_colons_and_at_signs(argv[i], NULL, NULL); if (!(pv = pvcreate_single(cmd, argv[i], &pp, 1))) { stack; diff --git a/tools/pvmove.c b/tools/pvmove.c index 7a2fd14a..19ebf178 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -664,7 +664,7 @@ int pvmove(struct cmd_context *cmd, int argc, char **argv) return ECMD_FAILED; } - unescape_colons_and_at_signs(pv_name, &colon, NULL); + dm_unescape_colons_and_at_signs(pv_name, &colon, NULL); /* Drop any PE lists from PV name */ if (colon) diff --git a/tools/pvremove.c b/tools/pvremove.c index 5a2a43e0..5a8884c9 100644 --- a/tools/pvremove.c +++ b/tools/pvremove.c @@ -150,7 +150,7 @@ int pvremove(struct cmd_context *cmd, int argc, char **argv) } for (i = 0; i < argc; i++) { - unescape_colons_and_at_signs(argv[i], NULL, NULL); + dm_unescape_colons_and_at_signs(argv[i], NULL, NULL); r = pvremove_single(cmd, argv[i], NULL); if (r > ret) ret = r; diff --git a/tools/toollib.c b/tools/toollib.c index b606df84..49c94244 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -707,7 +707,7 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv, if (argc) { log_verbose("Using physical volume(s) on command line"); for (; opt < argc; opt++) { - unescape_colons_and_at_signs(argv[opt], NULL, &at_sign); + dm_unescape_colons_and_at_signs(argv[opt], NULL, &at_sign); if (at_sign && (at_sign == argv[opt])) { tagname = at_sign + 1; @@ -1129,7 +1129,7 @@ struct dm_list *create_pv_list(struct dm_pool *mem, struct volume_group *vg, int dm_list_init(&arg_pvnames); for (i = 0; i < argc; i++) { - unescape_colons_and_at_signs(argv[i], &colon, &at_sign); + dm_unescape_colons_and_at_signs(argv[i], &colon, &at_sign); if (at_sign && (at_sign == argv[i])) { tagname = at_sign + 1; diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 0538459e..95b7d38d 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -395,7 +395,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) /* Move PVs across to new structure */ for (opt = 0; opt < argc; opt++) { - unescape_colons_and_at_signs(argv[opt], NULL, NULL); + dm_unescape_colons_and_at_signs(argv[opt], NULL, NULL); if (!move_pv(vg_from, vg_to, argv[opt])) goto_bad; } |