From d3a492a883bebdd2de5acd067f81480b167d7108 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 23 Jun 2016 11:29:50 -0400
Subject: [PATCH] events: Privatize virObjectEventCallback

It's only used in object_event.c, so remove it from the header. We
need to move the _virObjectEventCallback definition earlier as a
result.
---
 src/conf/object_event.c | 36 +++++++++++++++++++-----------------
 src/conf/object_event.h |  3 ---
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 06eedff819..95bf3e6619 100644
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -38,6 +38,25 @@
 
 VIR_LOG_INIT("conf.object_event");
 
+struct _virObjectEventCallback {
+    int callbackID;
+    virClassPtr klass;
+    int eventID;
+    virConnectPtr conn;
+    int remoteID;
+    bool uuid_filter;
+    unsigned char uuid[VIR_UUID_BUFLEN];
+    virObjectEventCallbackFilter filter;
+    void *filter_opaque;
+    virConnectObjectEventGenericCallback cb;
+    void *opaque;
+    virFreeCallback freecb;
+    bool deleted;
+    bool legacy; /* true if end user does not know callbackID */
+};
+typedef struct _virObjectEventCallback virObjectEventCallback;
+typedef virObjectEventCallback *virObjectEventCallbackPtr;
+
 struct _virObjectEventCallbackList {
     unsigned int nextID;
     size_t count;
@@ -63,23 +82,6 @@ struct _virObjectEventState {
     virMutex lock;
 };
 
-struct _virObjectEventCallback {
-    int callbackID;
-    virClassPtr klass;
-    int eventID;
-    virConnectPtr conn;
-    int remoteID;
-    bool uuid_filter;
-    unsigned char uuid[VIR_UUID_BUFLEN];
-    virObjectEventCallbackFilter filter;
-    void *filter_opaque;
-    virConnectObjectEventGenericCallback cb;
-    void *opaque;
-    virFreeCallback freecb;
-    bool deleted;
-    bool legacy; /* true if end user does not know callbackID */
-};
-
 static virClassPtr virObjectEventClass;
 
 static void virObjectEventDispose(void *obj);
diff --git a/src/conf/object_event.h b/src/conf/object_event.h
index 7654799e22..b0201ddd5a 100644
--- a/src/conf/object_event.h
+++ b/src/conf/object_event.h
@@ -29,9 +29,6 @@
 #ifndef __OBJECT_EVENT_H__
 # define __OBJECT_EVENT_H__
 
-typedef struct _virObjectEventCallback virObjectEventCallback;
-typedef virObjectEventCallback *virObjectEventCallbackPtr;
-
 /**
  * Dispatching domain events that come in while
  * in a call / response rpc
-- 
GitLab