[PATCH] Bug 1086726: Reworked error messages in libvirt.c, libvirt-domain.c removing uses of __FUNCTION__, except one

[Noella Ashu <ashu.noella207@xxxxxxxxx>]

---
 src/libvirt-domain.c | 13 +++++++------
 src/libvirt.c        |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index f1608dc..4a45b9e 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -2613,7 +2613,7 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     if ((conn->flags & VIR_CONNECT_RO) &&
         (flags & (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE))) {
         virReportError(VIR_ERR_OPERATION_DENIED, "%s",
-                       _("virDomainGetXMLDesc with secure flag"));
+                       _("Invalid secure flag for XML domain description"));
         goto error;
     }
 
@@ -2793,7 +2793,7 @@ virDomainMigrateVersion1(virDomainPtr domain,
 
     if (uri == NULL && uri_out == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("domainMigratePrepare did not set uri"));
+                       _("unset uri for domain migration preparation"));
         goto done;
     }
     if (uri_out)
@@ -2916,7 +2916,7 @@ virDomainMigrateVersion2(virDomainPtr domain,
 
     if (uri == NULL && uri_out == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("domainMigratePrepare2 did not set uri"));
+                       _("unset uri for domain migration preparation2"));
         cancelled = 1;
         /* Make sure Finish doesn't overwrite the error */
         orig_err = virSaveLastError();
@@ -3124,7 +3124,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain,
                virTypedParamsGetString(params, nparams,
                                        VIR_MIGRATE_PARAM_URI, &uri) <= 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("domainMigratePrepare3 did not set uri"));
+                       _("unset uri for domain migration preparation3"));
         cancelled = 1;
         orig_err = virSaveLastError();
         goto finish;
@@ -11285,7 +11285,7 @@ virDomainListGetStats(virDomainPtr *doms,
 
     if (!*doms) {
         virReportError(VIR_ERR_INVALID_ARG,
-                       _("doms array in %s must contain at least one domain"),
+                       _("doms array must contain at least one domain in %s"),
                        __FUNCTION__);
         goto cleanup;
     }
@@ -11503,7 +11503,8 @@ virDomainInterfaceAddresses(virDomainPtr dom,
         return ret;
     }
 
-    virReportError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+    virReportError(VIR_ERR_NO_SUPPORT, "%s", 
+                   _("No interface address support for domain object"));
 
  error:
     virDispatchError(dom->conn);
diff --git a/src/libvirt.c b/src/libvirt.c
index c8a5834..0109734 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -558,7 +558,7 @@ virSetSharedInterfaceDriver(virInterfaceDriverPtr driver)
 
     if (virSharedInterfaceDriver) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("A interface driver is already registered"));
+                       _("An interface driver is already registered"));
         return -1;
     }
 
@@ -1211,7 +1211,7 @@ do_open(const char *name,
 
     if (!ret->driver) {
         /* If we reach here, then all drivers declined the connection. */
-        virReportError(VIR_ERR_NO_CONNECT, "%s", NULLSTR(name));
+        virReportError(VIR_ERR_NO_CONNECT, "%s", _("All device drivers decline connection"));
         goto failed;
     }
 
-- 
2.1.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list