[libvirt] [go PATCH 03/37] Rename *cfuncs.{go, h} to *wrapper.{go, h}

Daniel P. Berrangé berrange at redhat.com
Mon Jul 16 13:23:49 UTC 2018


Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 api_test.go                                                 | 2 +-
 callbacks_cfuncs.go => callbacks_wrapper.go                 | 2 +-
 callbacks_cfuncs.h => callbacks_wrapper.h                   | 6 +++---
 connect.go                                                  | 2 +-
 connect_cfuncs.go => connect_wrapper.go                     | 4 ++--
 connect_cfuncs.h => connect_wrapper.h                       | 6 +++---
 domain_events.go                                            | 2 +-
 domain_events_cfuncs.go => domain_events_wrapper.go         | 4 ++--
 domain_events_cfuncs.h => domain_events_wrapper.h           | 6 +++---
 events.go                                                   | 2 +-
 events_cfuncs.go => events_wrapper.go                       | 2 +-
 events_cfuncs.h => events_wrapper.h                         | 6 +++---
 network_events.go                                           | 2 +-
 network_events_cfuncs.go => network_events_wrapper.go       | 4 ++--
 network_events_cfuncs.h => network_events_wrapper.h         | 6 +++---
 node_device_events.go                                       | 2 +-
 ...device_events_cfuncs.go => node_device_events_wrapper.go | 4 ++--
 node_device_events_cfuncs.h => node_device_events_wrapper.h | 6 +++---
 qemu.go                                                     | 2 +-
 qemu_cfuncs.go => qemu_wrapper.go                           | 4 ++--
 qemu_cfuncs.h => qemu_wrapper.h                             | 6 +++---
 secret_events.go                                            | 2 +-
 secret_events_cfuncs.go => secret_events_wrapper.go         | 4 ++--
 secret_events_cfuncs.h => secret_events_wrapper.h           | 6 +++---
 storage_pool_events.go                                      | 2 +-
 ..._pool_events_cfuncs.go => storage_pool_events_wrapper.go | 4 ++--
 ...ge_pool_events_cfuncs.h => storage_pool_events_wrapper.h | 6 +++---
 stream.go                                                   | 2 +-
 stream_cfuncs.go => stream_wrapper.go                       | 2 +-
 stream_cfuncs.h => stream_wrapper.h                         | 6 +++---
 30 files changed, 57 insertions(+), 57 deletions(-)
 rename callbacks_cfuncs.go => callbacks_wrapper.go (97%)
 rename callbacks_cfuncs.h => callbacks_wrapper.h (90%)
 rename connect_cfuncs.go => connect_wrapper.go (97%)
 rename connect_cfuncs.h => connect_wrapper.h (92%)
 rename domain_events_cfuncs.go => domain_events_wrapper.go (99%)
 rename domain_events_cfuncs.h => domain_events_wrapper.h (97%)
 rename events_cfuncs.go => events_wrapper.go (99%)
 rename events_cfuncs.h => events_wrapper.h (93%)
 rename network_events_cfuncs.go => network_events_wrapper.go (97%)
 rename network_events_cfuncs.h => network_events_wrapper.h (91%)
 rename node_device_events_cfuncs.go => node_device_events_wrapper.go (97%)
 rename node_device_events_cfuncs.h => node_device_events_wrapper.h (91%)
 rename qemu_cfuncs.go => qemu_wrapper.go (97%)
 rename qemu_cfuncs.h => qemu_wrapper.h (91%)
 rename secret_events_cfuncs.go => secret_events_wrapper.go (97%)
 rename secret_events_cfuncs.h => secret_events_wrapper.h (92%)
 rename storage_pool_events_cfuncs.go => storage_pool_events_wrapper.go (97%)
 rename storage_pool_events_cfuncs.h => storage_pool_events_wrapper.h (91%)
 rename stream_cfuncs.go => stream_wrapper.go (99%)
 rename stream_cfuncs.h => stream_wrapper.h (93%)

diff --git a/api_test.go b/api_test.go
index 53632df..06938a6 100644
--- a/api_test.go
+++ b/api_test.go
@@ -52,7 +52,7 @@ var (
 		/* Obsolete we use virConnectDomainEventRegisterAny instead */
 		"virConnectDomainEventRegister",
 
-		/* Wrapped in connect_cfuncs.go instead */
+		/* Wrapped in connect_wrapper.go instead */
 		"virConnectOpenAuth",
 		"virConnectRegisterCloseCallback",
 
diff --git a/callbacks_cfuncs.go b/callbacks_wrapper.go
similarity index 97%
rename from callbacks_cfuncs.go
rename to callbacks_wrapper.go
index 2cef0e4..967aaab 100644
--- a/callbacks_cfuncs.go
+++ b/callbacks_wrapper.go
@@ -30,7 +30,7 @@ package libvirt
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
-#include "callbacks_cfuncs.h"
+#include "callbacks_wrapper.h"
 
 extern void freeCallbackId(long);
 void freeGoCallback_cgo(void* goCallbackId) {
diff --git a/callbacks_cfuncs.h b/callbacks_wrapper.h
similarity index 90%
rename from callbacks_cfuncs.h
rename to callbacks_wrapper.h
index 689a777..f37aba4 100644
--- a/callbacks_cfuncs.h
+++ b/callbacks_wrapper.h
@@ -24,9 +24,9 @@
  *
  */
 
-#ifndef LIBVIRT_GO_CALLBACKS_CFUNCS_H__
-#define LIBVIRT_GO_CALLBACKS_CFUNCS_H__
+#ifndef LIBVIRT_GO_CALLBACKS_WRAPPER_H__
+#define LIBVIRT_GO_CALLBACKS_WRAPPER_H__
 
 void freeGoCallback_cgo(void* goCallbackId);
 
-#endif /* LIBVIRT_GO_CALLBACKS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_CALLBACKS_WRAPPER_H__ */
diff --git a/connect.go b/connect.go
index c608658..5c6d6ff 100644
--- a/connect.go
+++ b/connect.go
@@ -40,7 +40,7 @@ import (
 #include <libvirt/virterror.h>
 #include <stdlib.h>
 #include "connect_compat.h"
-#include "connect_cfuncs.h"
+#include "connect_wrapper.h"
 */
 import "C"
 
diff --git a/connect_cfuncs.go b/connect_wrapper.go
similarity index 97%
rename from connect_cfuncs.go
rename to connect_wrapper.go
index cb0467d..a686e29 100644
--- a/connect_cfuncs.go
+++ b/connect_wrapper.go
@@ -30,8 +30,8 @@ package libvirt
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
-#include "connect_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "connect_wrapper.h"
+#include "callbacks_wrapper.h"
 
 extern void closeCallback(virConnectPtr, int, long);
 void closeCallback_cgo(virConnectPtr conn, int reason, void *opaque)
diff --git a/connect_cfuncs.h b/connect_wrapper.h
similarity index 92%
rename from connect_cfuncs.h
rename to connect_wrapper.h
index 592fe98..5c59320 100644
--- a/connect_cfuncs.h
+++ b/connect_wrapper.h
@@ -24,11 +24,11 @@
  *
  */
 
-#ifndef LIBVIRT_GO_CONNECT_CFUNCS_H__
-#define LIBVIRT_GO_CONNECT_CFUNCS_H__
+#ifndef LIBVIRT_GO_CONNECT_WRAPPER_H__
+#define LIBVIRT_GO_CONNECT_WRAPPER_H__
 void closeCallback_cgo(virConnectPtr conn, int reason, void *opaque);
 int virConnectRegisterCloseCallback_cgo(virConnectPtr c, virConnectCloseFunc cb, long goCallbackId);
 
 virConnectPtr virConnectOpenAuthWrap(const char *name, int *credtype, uint ncredtype, int callbackID, unsigned int flags);
 
-#endif /* LIBVIRT_GO_CONNECT_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_CONNECT_WRAPPER_H__ */
diff --git a/domain_events.go b/domain_events.go
index 738c902..6d4ff24 100644
--- a/domain_events.go
+++ b/domain_events.go
@@ -34,7 +34,7 @@ import (
 /*
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
-#include "domain_events_cfuncs.h"
+#include "domain_events_wrapper.h"
 #include "domain_compat.h"
 */
 import "C"
diff --git a/domain_events_cfuncs.go b/domain_events_wrapper.go
similarity index 99%
rename from domain_events_cfuncs.go
rename to domain_events_wrapper.go
index c9de165..ad0f803 100644
--- a/domain_events_cfuncs.go
+++ b/domain_events_wrapper.go
@@ -30,8 +30,8 @@ package libvirt
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
-#include "domain_events_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "domain_events_wrapper.h"
+#include "callbacks_wrapper.h"
 #include <stdint.h>
 
 extern void domainEventLifecycleCallback(virConnectPtr, virDomainPtr, int, int, int);
diff --git a/domain_events_cfuncs.h b/domain_events_wrapper.h
similarity index 97%
rename from domain_events_cfuncs.h
rename to domain_events_wrapper.h
index 423a1cc..a0e494e 100644
--- a/domain_events_cfuncs.h
+++ b/domain_events_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
 
 void domainEventLifecycleCallback_cgo(virConnectPtr c, virDomainPtr d,
                                      int event, int detail, void* data);
@@ -121,4 +121,4 @@ int virConnectDomainEventRegisterAny_cgo(virConnectPtr c,  virDomainPtr d,
                                          long goCallbackId);
 
 
-#endif /* LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ */
diff --git a/events.go b/events.go
index ef80d82..74d480a 100644
--- a/events.go
+++ b/events.go
@@ -30,7 +30,7 @@ package libvirt
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include <stdint.h>
-#include "events_cfuncs.h"
+#include "events_wrapper.h"
 */
 import "C"
 
diff --git a/events_cfuncs.go b/events_wrapper.go
similarity index 99%
rename from events_cfuncs.go
rename to events_wrapper.go
index acd7b45..d17b054 100644
--- a/events_cfuncs.go
+++ b/events_wrapper.go
@@ -32,7 +32,7 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "events_cfuncs.h"
+#include "events_wrapper.h"
 
 void eventHandleCallback(int watch, int fd, int events, int callbackID);
 
diff --git a/events_cfuncs.h b/events_wrapper.h
similarity index 93%
rename from events_cfuncs.h
rename to events_wrapper.h
index 79e70ee..d3e78d8 100644
--- a/events_cfuncs.h
+++ b/events_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_EVENTS_WRAPPER_H__
 
 int virEventAddHandle_cgo(int fd, int events, int callbackID);
 int virEventAddTimeout_cgo(int freq, int callbackID);
@@ -36,4 +36,4 @@ void eventTimeoutCallbackInvoke(int timer, uintptr_t callback, uintptr_t opaque)
 void eventHandleCallbackFree(uintptr_t callback, uintptr_t opaque);
 void eventTimeoutCallbackFree(uintptr_t callback, uintptr_t opaque);
 
-#endif /* LIBVIRT_GO_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_EVENTS_WRAPPER_H__ */
diff --git a/network_events.go b/network_events.go
index 6c1423d..15b2f55 100644
--- a/network_events.go
+++ b/network_events.go
@@ -35,7 +35,7 @@ import (
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include "network_compat.h"
-#include "network_events_cfuncs.h"
+#include "network_events_wrapper.h"
 */
 import "C"
 
diff --git a/network_events_cfuncs.go b/network_events_wrapper.go
similarity index 97%
rename from network_events_cfuncs.go
rename to network_events_wrapper.go
index c4920ea..613e32b 100644
--- a/network_events_cfuncs.go
+++ b/network_events_wrapper.go
@@ -32,8 +32,8 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <assert.h>
 #include "network_compat.h"
-#include "network_events_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "network_events_wrapper.h"
+#include "callbacks_wrapper.h"
 #include <stdint.h>
 
 extern void networkEventLifecycleCallback(virConnectPtr, virNetworkPtr, int, int, int);
diff --git a/network_events_cfuncs.h b/network_events_wrapper.h
similarity index 91%
rename from network_events_cfuncs.h
rename to network_events_wrapper.h
index 58a684a..13ffce1 100644
--- a/network_events_cfuncs.h
+++ b/network_events_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_NETWORK_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_NETWORK_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__
 
 void networkEventLifecycleCallback_cgo(virConnectPtr c, virNetworkPtr d,
                                      int event, int detail, void* data);
@@ -35,4 +35,4 @@ int virConnectNetworkEventRegisterAny_cgo(virConnectPtr c,  virNetworkPtr d,
                                          long goCallbackId);
 
 
-#endif /* LIBVIRT_GO_NETWORK_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__ */
diff --git a/node_device_events.go b/node_device_events.go
index a43d9f2..01c2245 100644
--- a/node_device_events.go
+++ b/node_device_events.go
@@ -35,7 +35,7 @@ import (
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include "node_device_compat.h"
-#include "node_device_events_cfuncs.h"
+#include "node_device_events_wrapper.h"
 */
 import "C"
 
diff --git a/node_device_events_cfuncs.go b/node_device_events_wrapper.go
similarity index 97%
rename from node_device_events_cfuncs.go
rename to node_device_events_wrapper.go
index 12aaf60..a34fa6f 100644
--- a/node_device_events_cfuncs.go
+++ b/node_device_events_wrapper.go
@@ -32,8 +32,8 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <assert.h>
 #include "node_device_compat.h"
-#include "node_device_events_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "node_device_events_wrapper.h"
+#include "callbacks_wrapper.h"
 #include <stdint.h>
 
 extern void nodeDeviceEventLifecycleCallback(virConnectPtr, virNodeDevicePtr, int, int, int);
diff --git a/node_device_events_cfuncs.h b/node_device_events_wrapper.h
similarity index 91%
rename from node_device_events_cfuncs.h
rename to node_device_events_wrapper.h
index 0d01075..38b1036 100644
--- a/node_device_events_cfuncs.h
+++ b/node_device_events_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_NODE_DEVICE_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_NODE_DEVICE_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__
 
 void nodeDeviceEventLifecycleCallback_cgo(virConnectPtr c, virNodeDevicePtr d,
 					  int event, int detail, void* data);
@@ -37,4 +37,4 @@ int virConnectNodeDeviceEventRegisterAny_cgo(virConnectPtr c,  virNodeDevicePtr
 					     long goCallbackId);
 
 
-#endif /* LIBVIRT_GO_NODE_DEVICE_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__ */
diff --git a/qemu.go b/qemu.go
index 38f3eaf..dd30a7d 100644
--- a/qemu.go
+++ b/qemu.go
@@ -38,7 +38,7 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <stdlib.h>
 #include "qemu_compat.h"
-#include "qemu_cfuncs.h"
+#include "qemu_wrapper.h"
 */
 import "C"
 
diff --git a/qemu_cfuncs.go b/qemu_wrapper.go
similarity index 97%
rename from qemu_cfuncs.go
rename to qemu_wrapper.go
index 83bb67a..41fe0cf 100644
--- a/qemu_cfuncs.go
+++ b/qemu_wrapper.go
@@ -35,8 +35,8 @@ package libvirt
 #include <libvirt/libvirt-qemu.h>
 #include <libvirt/virterror.h>
 #include "qemu_compat.h"
-#include "qemu_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "qemu_wrapper.h"
+#include "callbacks_wrapper.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/qemu_cfuncs.h b/qemu_wrapper.h
similarity index 91%
rename from qemu_cfuncs.h
rename to qemu_wrapper.h
index f1f48b0..4495cc4 100644
--- a/qemu_cfuncs.h
+++ b/qemu_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
 
 void domainQemuMonitorEventCallback_cgo(virConnectPtr c, virDomainPtr d,
 					const char *event, long long secs,
@@ -36,4 +36,4 @@ int virConnectDomainQemuMonitorEventRegister_cgo(virConnectPtr c,  virDomainPtr
 						 long goCallbackId, unsigned int flags);
 
 
-#endif /* LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ */
diff --git a/secret_events.go b/secret_events.go
index 7da9428..92c86a2 100644
--- a/secret_events.go
+++ b/secret_events.go
@@ -35,7 +35,7 @@ import (
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include "secret_compat.h"
-#include "secret_events_cfuncs.h"
+#include "secret_events_wrapper.h"
 */
 import "C"
 
diff --git a/secret_events_cfuncs.go b/secret_events_wrapper.go
similarity index 97%
rename from secret_events_cfuncs.go
rename to secret_events_wrapper.go
index 158008b..55d3394 100644
--- a/secret_events_cfuncs.go
+++ b/secret_events_wrapper.go
@@ -32,8 +32,8 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <assert.h>
 #include "secret_compat.h"
-#include "secret_events_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "secret_events_wrapper.h"
+#include "callbacks_wrapper.h"
 #include <stdint.h>
 
 extern void secretEventLifecycleCallback(virConnectPtr, virSecretPtr, int, int, int);
diff --git a/secret_events_cfuncs.h b/secret_events_wrapper.h
similarity index 92%
rename from secret_events_cfuncs.h
rename to secret_events_wrapper.h
index 96401d5..4ad299c 100644
--- a/secret_events_cfuncs.h
+++ b/secret_events_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_SECRET_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_SECRET_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__
 
 void secretEventLifecycleCallback_cgo(virConnectPtr c, virSecretPtr d,
 				      int event, int detail, void* data);
@@ -37,4 +37,4 @@ int virConnectSecretEventRegisterAny_cgo(virConnectPtr c,  virSecretPtr d,
                                          long goCallbackId);
 
 
-#endif /* LIBVIRT_GO_SECRET_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__ */
diff --git a/storage_pool_events.go b/storage_pool_events.go
index 2a37114..5be9191 100644
--- a/storage_pool_events.go
+++ b/storage_pool_events.go
@@ -35,7 +35,7 @@ import (
 #cgo pkg-config: libvirt
 #include <libvirt/libvirt.h>
 #include "storage_pool_compat.h"
-#include "storage_pool_events_cfuncs.h"
+#include "storage_pool_events_wrapper.h"
 */
 import "C"
 
diff --git a/storage_pool_events_cfuncs.go b/storage_pool_events_wrapper.go
similarity index 97%
rename from storage_pool_events_cfuncs.go
rename to storage_pool_events_wrapper.go
index 52ec553..0d99909 100644
--- a/storage_pool_events_cfuncs.go
+++ b/storage_pool_events_wrapper.go
@@ -32,8 +32,8 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <assert.h>
 #include "storage_pool_compat.h"
-#include "storage_pool_events_cfuncs.h"
-#include "callbacks_cfuncs.h"
+#include "storage_pool_events_wrapper.h"
+#include "callbacks_wrapper.h"
 #include <stdint.h>
 
 extern void storagePoolEventLifecycleCallback(virConnectPtr, virStoragePoolPtr, int, int, int);
diff --git a/storage_pool_events_cfuncs.h b/storage_pool_events_wrapper.h
similarity index 91%
rename from storage_pool_events_cfuncs.h
rename to storage_pool_events_wrapper.h
index 0087d6f..c8a10c9 100644
--- a/storage_pool_events_cfuncs.h
+++ b/storage_pool_events_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_STORAGE_POOL_EVENTS_CFUNCS_H__
-#define LIBVIRT_GO_STORAGE_POOL_EVENTS_CFUNCS_H__
+#ifndef LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__
+#define LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__
 
 void storagePoolEventLifecycleCallback_cgo(virConnectPtr c, virStoragePoolPtr d,
 					   int event, int detail, void* data);
@@ -37,4 +37,4 @@ int virConnectStoragePoolEventRegisterAny_cgo(virConnectPtr c,  virStoragePoolPt
 					      long goCallbackId);
 
 
-#endif /* LIBVIRT_GO_STORAGE_POOL_EVENTS_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__ */
diff --git a/stream.go b/stream.go
index fcd1cd3..b26e8e9 100644
--- a/stream.go
+++ b/stream.go
@@ -31,7 +31,7 @@ package libvirt
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #include <stdlib.h>
-#include "stream_cfuncs.h"
+#include "stream_wrapper.h"
 #include "stream_compat.h"
 */
 import "C"
diff --git a/stream_cfuncs.go b/stream_wrapper.go
similarity index 99%
rename from stream_cfuncs.go
rename to stream_wrapper.go
index 99cde0e..ea2e0cb 100644
--- a/stream_cfuncs.go
+++ b/stream_wrapper.go
@@ -33,7 +33,7 @@ package libvirt
 #include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "stream_cfuncs.h"
+#include "stream_wrapper.h"
 
 int streamSourceCallback(virStreamPtr st, char *cdata, size_t nbytes, int callbackID);
 int streamSourceHoleCallback(virStreamPtr st, int *inData, long long *length, int callbackID);
diff --git a/stream_cfuncs.h b/stream_wrapper.h
similarity index 93%
rename from stream_cfuncs.h
rename to stream_wrapper.h
index d5696ec..778e457 100644
--- a/stream_cfuncs.h
+++ b/stream_wrapper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LIBVIRT_GO_STREAM_CFUNCS_H__
-#define LIBVIRT_GO_STREAM_CFUNCS_H__
+#ifndef LIBVIRT_GO_STREAM_WRAPPER_H__
+#define LIBVIRT_GO_STREAM_WRAPPER_H__
 
 int virStreamSendAll_cgo(virStreamPtr st, int callbackID);
 int virStreamRecvAll_cgo(virStreamPtr st, int callbackID);
@@ -34,4 +34,4 @@ int virStreamSparseRecvAll_cgo(virStreamPtr st, int callbackID, int holeCallback
 
 int virStreamEventAddCallback_cgo(virStreamPtr st, int events, int callbackID);
 
-#endif /* LIBVIRT_GO_STREAM_CFUNCS_H__ */
+#endif /* LIBVIRT_GO_STREAM_WRAPPER_H__ */
-- 
2.17.1




More information about the libvir-list mailing list