From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 19 Jul 2021 11:23:29 +0000 (+0200)
Subject: virsh-volume: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers
X-Git-Tag: v7.6.0-rc1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b12a0e62f0dc2c82a8dc068ab797f9faab4e488a;p=thirdparty%2Flibvirt.git

virsh-volume: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers

Stuff used in virsh should use 'virsh'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 1da9b7217f..fe632b1b19 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -962,8 +962,8 @@ static const vshCmdOptDef opts_vol_wipe[] = {
     {.name = NULL}
 };
 
-VIR_ENUM_DECL(virStorageVolWipeAlgorithm);
-VIR_ENUM_IMPL(virStorageVolWipeAlgorithm,
+VIR_ENUM_DECL(virshStorageVolWipeAlgorithm);
+VIR_ENUM_IMPL(virshStorageVolWipeAlgorithm,
               VIR_STORAGE_VOL_WIPE_ALG_LAST,
               "zero", "nnsa", "dod", "bsi", "gutmann", "schneier",
               "pfitzner7", "pfitzner33", "random", "trim");
@@ -985,7 +985,7 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd)
         goto out;
 
     if (algorithm_str &&
-        (algorithm = virStorageVolWipeAlgorithmTypeFromString(algorithm_str)) < 0) {
+        (algorithm = virshStorageVolWipeAlgorithmTypeFromString(algorithm_str)) < 0) {
         vshError(ctl, _("Unsupported algorithm '%s'"), algorithm_str);
         goto out;
     }