[libvirt] [go PATCH 13/37] storage pool: move wrapper functions out of compat header

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- storage_pool_compat.go | 46 ---------------------------------- storage_pool_compat.h | 4 --- storage_pool_events_wrapper.go | 10 ++++++++ storage_pool_events_wrapper.h | 2 ++ 4 files changed, 12 insertions(+), 50 deletions(-) delete mode 100644 storage_pool_compat.go diff --git a/storage_pool_compat.go b/storage_pool_compat.go deleted file mode 100644 index 7ad66b3..0000000 --- a/storage_pool_compat.go +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of the libvirt-go project - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * Copyright (c) 2013 Alex Zorin - * Copyright (C) 2016 Red Hat, Inc. - * - */ - -package libvirt - -/* -#cgo pkg-config: libvirt -#include <libvirt/libvirt.h> -#include <assert.h> -#include "storage_pool_compat.h" - -int virConnectStoragePoolEventDeregisterAnyWrapper(virConnectPtr conn, - int callbackID) -{ -#if LIBVIR_VERSION_NUMBER < 2000000 - assert(0); // Caller shouuld have checked version -#else - return virConnectStoragePoolEventDeregisterAny(conn, callbackID); -#endif -} - -*/ -import "C" diff --git a/storage_pool_compat.h b/storage_pool_compat.h index cad74fd..4df1a0d 100644 --- a/storage_pool_compat.h +++ b/storage_pool_compat.h @@ -78,10 +78,6 @@ typedef void (*virConnectStoragePoolEventGenericCallback)(virConnectPtr conn, void *opaque); #endif -int virConnectStoragePoolEventDeregisterAnyWrapper(virConnectPtr conn, - int callbackID); - - /* 3.8.0 */ #ifndef VIR_STORAGE_POOL_EVENT_CREATED diff --git a/storage_pool_events_wrapper.go b/storage_pool_events_wrapper.go index 9670440..d03f6c5 100644 --- a/storage_pool_events_wrapper.go +++ b/storage_pool_events_wrapper.go @@ -61,5 +61,15 @@ int virConnectStoragePoolEventRegisterAnyWrapper(virConnectPtr c, virStoragePoo #endif } +int virConnectStoragePoolEventDeregisterAnyWrapper(virConnectPtr conn, + int callbackID) +{ +#if LIBVIR_VERSION_NUMBER < 2000000 + assert(0); // Caller shouuld have checked version +#else + return virConnectStoragePoolEventDeregisterAny(conn, callbackID); +#endif +} + */ import "C" diff --git a/storage_pool_events_wrapper.h b/storage_pool_events_wrapper.h index c82abb2..2420dee 100644 --- a/storage_pool_events_wrapper.h +++ b/storage_pool_events_wrapper.h @@ -36,5 +36,7 @@ int virConnectStoragePoolEventRegisterAnyWrapper(virConnectPtr c, virStoragePoo int eventID, virConnectStoragePoolEventGenericCallback cb, long goCallbackId); +int virConnectStoragePoolEventDeregisterAnyWrapper(virConnectPtr conn, + int callbackID); #endif /* LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__ */ -- 2.17.1