From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 7 Oct 2013 17:21:47 +0000 (+0200)
Subject: virerror: s/VIR_ERR_STORAGE_VOL_EXISTS/VIR_ERR_STORAGE_VOL_EXISTS/
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4b744d7d00e18ee7c0d8f89542954743d64ffeef;p=libvirt.git

virerror: s/VIR_ERR_STORAGE_VOL_EXISTS/VIR_ERR_STORAGE_VOL_EXISTS/

We currently have other error codes in singular form, e.g.
VIR_ERR_NETWORK_EXIST. Cleanup the previous patch to match the form.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index fd142371da..e31e9c4888 100644
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -296,7 +296,7 @@ typedef enum {
     VIR_ERR_ACCESS_DENIED = 88,         /* operation on the object/resource
                                            was denied */
     VIR_ERR_DBUS_SERVICE = 89,          /* error from a dbus service */
-    VIR_ERR_STORAGE_VOL_EXISTS = 90,         /* the storage vol already exists */
+    VIR_ERR_STORAGE_VOL_EXIST = 90,     /* the storage vol already exists */
 } virErrorNumber;
 
 /**
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index d419a36e2e..b3f0871fce 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1538,7 +1538,7 @@ storageVolCreateXML(virStoragePoolPtr obj,
         goto cleanup;
 
     if (virStorageVolDefFindByName(pool, voldef->name)) {
-        virReportError(VIR_ERR_STORAGE_VOL_EXISTS,
+        virReportError(VIR_ERR_STORAGE_VOL_EXIST,
                        _("'%s'"), voldef->name);
         goto cleanup;
     }
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 3f55cec1c7..d9a9fc4e8a 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -1004,7 +1004,7 @@ virErrorMsg(virErrorNumber error, const char *info)
             else
                 errmsg = _("Storage volume not found: %s");
             break;
-        case VIR_ERR_STORAGE_VOL_EXISTS:
+        case VIR_ERR_STORAGE_VOL_EXIST:
             if (info == NULL)
                 errmsg = _("this storage volume exists already");
             else