[PATCH] s/Un/De in virConnectUnregisterCloseCallback

["Daniel P. Berrange" <berrange@xxxxxxxxxx>]

From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>

Previous APIs have used the word 'Deregister' rather than
'Unregister', so rename the recently added API to match.
---
 include/libvirt/libvirt.h.in |    2 +-
 src/libvirt.c                |    8 ++++----
 src/libvirt_public.syms      |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index d21d029..7fed091 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1197,7 +1197,7 @@ int virConnectRegisterCloseCallback(virConnectPtr conn,
                                     virConnectCloseFunc cb,
                                     void *opaque,
                                     virFreeCallback freecb);
-int virConnectUnregisterCloseCallback(virConnectPtr conn,
+int virConnectDeregisterCloseCallback(virConnectPtr conn,
                                       virConnectCloseFunc cb);
 
 /*
diff --git a/src/libvirt.c b/src/libvirt.c
index 8e789be..a97976c 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -13945,7 +13945,7 @@ error:
  * funtion.
  *
  * Use of this method is no longer recommended. Instead applications
- * should try virConnectDomainEventUnregisterAny which has a more flexible
+ * should try virConnectDomainEventDeregisterAny which has a more flexible
  * API contract
  *
  * Returns 0 on success, -1 on failure
@@ -16541,7 +16541,7 @@ error:
  *
  * The return value from this method is a positive integer identifier
  * for the callback. To unregister a callback, this callback ID should
- * be passed to the virDomainEventUnregisterAny method
+ * be passed to the virDomainEventDeregisterAny method
  *
  * Returns a callback identifier on success, -1 on failure
  */
@@ -18687,7 +18687,7 @@ error:
 }
 
 /**
- * virConnectUnregisterCloseCallback:
+ * virConnectDeregisterCloseCallback:
  * @conn: pointer to connection object
  * @cb: pointer to the current registered callback
  *
@@ -18699,7 +18699,7 @@ error:
  *
  * Returns 0 on success, -1 on error
  */
-int virConnectUnregisterCloseCallback(virConnectPtr conn,
+int virConnectDeregisterCloseCallback(virConnectPtr conn,
                                       virConnectCloseFunc cb)
 {
     VIR_DEBUG("conn=%p", conn);
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 5004182..d465a57 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -548,7 +548,7 @@ LIBVIRT_0.9.14 {
     global:
         virDomainGetHostname;
         virConnectRegisterCloseCallback;
-        virConnectUnregisterCloseCallback;
+        virConnectDeregisterCloseCallback;
 } LIBVIRT_0.9.13;
 
 # .... define new API here using predicted next version number ....
-- 
1.7.10.4

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