test: Cleanup testDomainRenameCallback

Rather than have a need for old_dom_name, let's just VIR_FREE
the old name first, then use VIR_STEAL_PTR to handle the swap
from the old name to the new name.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index bc53382f5e718e99dbaeb7e7048e6761f3b7b0e3..d46937b7f6f5307295ac788659fd51a01f3bbd2c 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2579,7 +2579,6 @@ testDomainRenameCallback(virDomainObjPtr privdom,
     virObjectEventPtr event_old = NULL;
     int ret = -1;
     char *new_dom_name = NULL;
-    char *old_dom_name = NULL;
 
     virCheckFlags(0, -1);
 
@@ -2597,9 +2596,8 @@ testDomainRenameCallback(virDomainObjPtr privdom,
                                                   VIR_DOMAIN_EVENT_UNDEFINED_RENAMED);
 
     /* Switch name in domain definition. */
-    old_dom_name = privdom->def->name;
-    privdom->def->name = new_dom_name;
-    new_dom_name = NULL;
+    VIR_FREE(privdom->def->name);
+    VIR_STEAL_PTR(privdom->def->name, new_dom_name);
 
     event_new = virDomainEventLifecycleNewFromObj(privdom,
                                                   VIR_DOMAIN_EVENT_DEFINED,
@@ -2607,7 +2605,6 @@ testDomainRenameCallback(virDomainObjPtr privdom,
     ret = 0;
 
  cleanup:
-    VIR_FREE(old_dom_name);
     VIR_FREE(new_dom_name);
     virObjectEventStateQueue(driver->eventState, event_old);
     virObjectEventStateQueue(driver->eventState, event_new);