From nobody Sun Feb 8 03:33:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531747474524368.5222413903431; Mon, 16 Jul 2018 06:24:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 950ECCA1DC; Mon, 16 Jul 2018 13:24:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B07F5D9D1; Mon, 16 Jul 2018 13:24:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F06C81853DA1; Mon, 16 Jul 2018 13:24:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6GDOTeN027964 for ; Mon, 16 Jul 2018 09:24:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 254162027047; Mon, 16 Jul 2018 13:24:29 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C3DF2026D65; Mon, 16 Jul 2018 13:24:28 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:23:49 +0100 Message-Id: <20180716132423.10354-4-berrange@redhat.com> In-Reply-To: <20180716132423.10354-1-berrange@redhat.com> References: <20180716132423.10354-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 03/37] Rename *cfuncs.{go, h} to *wrapper.{go, h} X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 16 Jul 2018 13:24:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- api_test.go | 2 +- callbacks_cfuncs.go =3D> callbacks_wrapper.go | 2 +- callbacks_cfuncs.h =3D> callbacks_wrapper.h | 6 +++--- connect.go | 2 +- connect_cfuncs.go =3D> connect_wrapper.go | 4 ++-- connect_cfuncs.h =3D> connect_wrapper.h | 6 +++--- domain_events.go | 2 +- domain_events_cfuncs.go =3D> domain_events_wrapper.go | 4 ++-- domain_events_cfuncs.h =3D> domain_events_wrapper.h | 6 +++--- events.go | 2 +- events_cfuncs.go =3D> events_wrapper.go | 2 +- events_cfuncs.h =3D> events_wrapper.h | 6 +++--- network_events.go | 2 +- network_events_cfuncs.go =3D> network_events_wrapper.go | 4 ++-- network_events_cfuncs.h =3D> network_events_wrapper.h | 6 +++--- node_device_events.go | 2 +- ...device_events_cfuncs.go =3D> node_device_events_wrapper.go | 4 ++-- node_device_events_cfuncs.h =3D> node_device_events_wrapper.h | 6 +++--- qemu.go | 2 +- qemu_cfuncs.go =3D> qemu_wrapper.go | 4 ++-- qemu_cfuncs.h =3D> qemu_wrapper.h | 6 +++--- secret_events.go | 2 +- secret_events_cfuncs.go =3D> secret_events_wrapper.go | 4 ++-- secret_events_cfuncs.h =3D> secret_events_wrapper.h | 6 +++--- storage_pool_events.go | 2 +- ..._pool_events_cfuncs.go =3D> storage_pool_events_wrapper.go | 4 ++-- ...ge_pool_events_cfuncs.h =3D> storage_pool_events_wrapper.h | 6 +++--- stream.go | 2 +- stream_cfuncs.go =3D> stream_wrapper.go | 2 +- stream_cfuncs.h =3D> stream_wrapper.h | 6 +++--- 30 files changed, 57 insertions(+), 57 deletions(-) rename callbacks_cfuncs.go =3D> callbacks_wrapper.go (97%) rename callbacks_cfuncs.h =3D> callbacks_wrapper.h (90%) rename connect_cfuncs.go =3D> connect_wrapper.go (97%) rename connect_cfuncs.h =3D> connect_wrapper.h (92%) rename domain_events_cfuncs.go =3D> domain_events_wrapper.go (99%) rename domain_events_cfuncs.h =3D> domain_events_wrapper.h (97%) rename events_cfuncs.go =3D> events_wrapper.go (99%) rename events_cfuncs.h =3D> events_wrapper.h (93%) rename network_events_cfuncs.go =3D> network_events_wrapper.go (97%) rename network_events_cfuncs.h =3D> network_events_wrapper.h (91%) rename node_device_events_cfuncs.go =3D> node_device_events_wrapper.go (97= %) rename node_device_events_cfuncs.h =3D> node_device_events_wrapper.h (91%) rename qemu_cfuncs.go =3D> qemu_wrapper.go (97%) rename qemu_cfuncs.h =3D> qemu_wrapper.h (91%) rename secret_events_cfuncs.go =3D> secret_events_wrapper.go (97%) rename secret_events_cfuncs.h =3D> secret_events_wrapper.h (92%) rename storage_pool_events_cfuncs.go =3D> storage_pool_events_wrapper.go (= 97%) rename storage_pool_events_cfuncs.h =3D> storage_pool_events_wrapper.h (91= %) rename stream_cfuncs.go =3D> stream_wrapper.go (99%) rename stream_cfuncs.h =3D> 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", =20 - /* Wrapped in connect_cfuncs.go instead */ + /* Wrapped in connect_wrapper.go instead */ "virConnectOpenAuth", "virConnectRegisterCloseCallback", =20 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 #include -#include "callbacks_cfuncs.h" +#include "callbacks_wrapper.h" =20 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 @@ * */ =20 -#ifndef LIBVIRT_GO_CALLBACKS_CFUNCS_H__ -#define LIBVIRT_GO_CALLBACKS_CFUNCS_H__ +#ifndef LIBVIRT_GO_CALLBACKS_WRAPPER_H__ +#define LIBVIRT_GO_CALLBACKS_WRAPPER_H__ =20 void freeGoCallback_cgo(void* goCallbackId); =20 -#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 #include #include "connect_compat.h" -#include "connect_cfuncs.h" +#include "connect_wrapper.h" */ import "C" =20 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 #include -#include "connect_cfuncs.h" -#include "callbacks_cfuncs.h" +#include "connect_wrapper.h" +#include "callbacks_wrapper.h" =20 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 @@ * */ =20 -#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, virConnectCloseFu= nc cb, long goCallbackId); =20 virConnectPtr virConnectOpenAuthWrap(const char *name, int *credtype, uint= ncredtype, int callbackID, unsigned int flags); =20 -#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 -#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 #include -#include "domain_events_cfuncs.h" -#include "callbacks_cfuncs.h" +#include "domain_events_wrapper.h" +#include "callbacks_wrapper.h" #include =20 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 @@ * */ =20 -#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__ =20 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); =20 =20 -#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 #include -#include "events_cfuncs.h" +#include "events_wrapper.h" */ import "C" =20 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 #include #include -#include "events_cfuncs.h" +#include "events_wrapper.h" =20 void eventHandleCallback(int watch, int fd, int events, int callbackID); =20 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 @@ * */ =20 -#ifndef LIBVIRT_GO_EVENTS_CFUNCS_H__ -#define LIBVIRT_GO_EVENTS_CFUNCS_H__ +#ifndef LIBVIRT_GO_EVENTS_WRAPPER_H__ +#define LIBVIRT_GO_EVENTS_WRAPPER_H__ =20 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 call= back, uintptr_t opaque) void eventHandleCallbackFree(uintptr_t callback, uintptr_t opaque); void eventTimeoutCallbackFree(uintptr_t callback, uintptr_t opaque); =20 -#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 #include "network_compat.h" -#include "network_events_cfuncs.h" +#include "network_events_wrapper.h" */ import "C" =20 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 #include #include "network_compat.h" -#include "network_events_cfuncs.h" -#include "callbacks_cfuncs.h" +#include "network_events_wrapper.h" +#include "callbacks_wrapper.h" #include =20 extern void networkEventLifecycleCallback(virConnectPtr, virNetworkPtr, in= t, 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 @@ * */ =20 -#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__ =20 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); =20 =20 -#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 #include "node_device_compat.h" -#include "node_device_events_cfuncs.h" +#include "node_device_events_wrapper.h" */ import "C" =20 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 #include #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 =20 extern void nodeDeviceEventLifecycleCallback(virConnectPtr, virNodeDeviceP= tr, 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 @@ * */ =20 -#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__ =20 void nodeDeviceEventLifecycleCallback_cgo(virConnectPtr c, virNodeDevicePt= r d, int event, int detail, void* data); @@ -37,4 +37,4 @@ int virConnectNodeDeviceEventRegisterAny_cgo(virConnectPt= r c, virNodeDevicePtr long goCallbackId); =20 =20 -#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 #include #include "qemu_compat.h" -#include "qemu_cfuncs.h" +#include "qemu_wrapper.h" */ import "C" =20 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 #include #include "qemu_compat.h" -#include "qemu_cfuncs.h" -#include "callbacks_cfuncs.h" +#include "qemu_wrapper.h" +#include "callbacks_wrapper.h" #include #include =20 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 @@ * */ =20 -#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__ =20 void domainQemuMonitorEventCallback_cgo(virConnectPtr c, virDomainPtr d, const char *event, long long secs, @@ -36,4 +36,4 @@ int virConnectDomainQemuMonitorEventRegister_cgo(virConne= ctPtr c, virDomainPtr long goCallbackId, unsigned int flags); =20 =20 -#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 #include "secret_compat.h" -#include "secret_events_cfuncs.h" +#include "secret_events_wrapper.h" */ import "C" =20 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 #include #include "secret_compat.h" -#include "secret_events_cfuncs.h" -#include "callbacks_cfuncs.h" +#include "secret_events_wrapper.h" +#include "callbacks_wrapper.h" #include =20 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 @@ * */ =20 -#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__ =20 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); =20 =20 -#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 #include "storage_pool_compat.h" -#include "storage_pool_events_cfuncs.h" +#include "storage_pool_events_wrapper.h" */ import "C" =20 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 #include #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 =20 extern void storagePoolEventLifecycleCallback(virConnectPtr, virStoragePoo= lPtr, 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 @@ * */ =20 -#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__ =20 void storagePoolEventLifecycleCallback_cgo(virConnectPtr c, virStoragePool= Ptr d, int event, int detail, void* data); @@ -37,4 +37,4 @@ int virConnectStoragePoolEventRegisterAny_cgo(virConnectP= tr c, virStoragePoolPt long goCallbackId); =20 =20 -#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 #include #include -#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 #include #include -#include "stream_cfuncs.h" +#include "stream_wrapper.h" =20 int streamSourceCallback(virStreamPtr st, char *cdata, size_t nbytes, int = callbackID); int streamSourceHoleCallback(virStreamPtr st, int *inData, long long *leng= th, 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 @@ * */ =20 -#ifndef LIBVIRT_GO_STREAM_CFUNCS_H__ -#define LIBVIRT_GO_STREAM_CFUNCS_H__ +#ifndef LIBVIRT_GO_STREAM_WRAPPER_H__ +#define LIBVIRT_GO_STREAM_WRAPPER_H__ =20 int virStreamSendAll_cgo(virStreamPtr st, int callbackID); int virStreamRecvAll_cgo(virStreamPtr st, int callbackID); @@ -34,4 +34,4 @@ int virStreamSparseRecvAll_cgo(virStreamPtr st, int callb= ackID, int holeCallback =20 int virStreamEventAddCallback_cgo(virStreamPtr st, int events, int callbac= kID); =20 -#endif /* LIBVIRT_GO_STREAM_CFUNCS_H__ */ +#endif /* LIBVIRT_GO_STREAM_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list