8:23 a.m.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
stream_compat.go | 69 -----------------------------------------------
stream_compat.h | 13 ---------
stream_wrapper.go | 34 +++++++++++++++++++++++
stream_wrapper.h | 12 +++++++++
4 files changed, 46 insertions(+), 82 deletions(-)
delete mode 100644 stream_compat.go
diff --git a/stream_compat.go b/stream_compat.go
deleted file mode 100644
index d718ae1..0000000
--- a/stream_compat.go
+++ /dev/null
@@ -1,69 +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) 2017 Red Hat, Inc.
- *
- */
-
-package libvirt
-
-/*
-#cgo pkg-config: libvirt
-#include <libvirt/libvirt.h>
-#include <assert.h>
-#include "stream_compat.h"
-
-int virStreamRecvFlagsWrapper(virStreamPtr st,
- char *data,
- size_t nbytes,
- unsigned int flags)
-{
-#if LIBVIR_VERSION_NUMBER < 3004000
- assert(0); // Caller should have checked version
-#else
- return virStreamRecvFlags(st, data, nbytes, flags);
-#endif
-}
-
-int virStreamSendHoleWrapper(virStreamPtr st,
- long long length,
- unsigned int flags)
-{
-#if LIBVIR_VERSION_NUMBER < 3004000
- assert(0); // Caller should have checked version
-#else
- return virStreamSendHole(st, length, flags);
-#endif
-}
-
-int virStreamRecvHoleWrapper(virStreamPtr st,
- long long *length,
- unsigned int flags)
-{
-#if LIBVIR_VERSION_NUMBER < 3004000
- assert(0); // Caller should have checked version
-#else
- return virStreamRecvHole(st, length, flags);
-#endif
-}
-
-*/
-import "C"
diff --git a/stream_compat.h b/stream_compat.h
index 9db2184..92befd5 100644
--- a/stream_compat.h
+++ b/stream_compat.h
@@ -33,17 +33,4 @@
#define VIR_STREAM_RECV_STOP_AT_HOLE (1 << 0)
#endif
-int virStreamRecvFlagsWrapper(virStreamPtr st,
- char *data,
- size_t nbytes,
- unsigned int flags);
-
-int virStreamSendHoleWrapper(virStreamPtr st,
- long long length,
- unsigned int flags);
-
-int virStreamRecvHoleWrapper(virStreamPtr,
- long long *length,
- unsigned int flags);
-
#endif /* LIBVIRT_GO_STREAM_COMPAT_H__ */
diff --git a/stream_wrapper.go b/stream_wrapper.go
index 4e1c2c9..419bb41 100644
--- a/stream_wrapper.go
+++ b/stream_wrapper.go
@@ -128,5 +128,39 @@ int virStreamEventAddCallbackWrapper(virStreamPtr st, int events, int
callbackID
return virStreamEventAddCallback(st, events, streamEventCallbackHelper, (void
*)(intptr_t)callbackID, NULL);
}
+int virStreamRecvFlagsWrapper(virStreamPtr st,
+ char *data,
+ size_t nbytes,
+ unsigned int flags)
+{
+#if LIBVIR_VERSION_NUMBER < 3004000
+ assert(0); // Caller should have checked version
+#else
+ return virStreamRecvFlags(st, data, nbytes, flags);
+#endif
+}
+
+int virStreamSendHoleWrapper(virStreamPtr st,
+ long long length,
+ unsigned int flags)
+{
+#if LIBVIR_VERSION_NUMBER < 3004000
+ assert(0); // Caller should have checked version
+#else
+ return virStreamSendHole(st, length, flags);
+#endif
+}
+
+int virStreamRecvHoleWrapper(virStreamPtr st,
+ long long *length,
+ unsigned int flags)
+{
+#if LIBVIR_VERSION_NUMBER < 3004000
+ assert(0); // Caller should have checked version
+#else
+ return virStreamRecvHole(st, length, flags);
+#endif
+}
+
*/
import "C"
diff --git a/stream_wrapper.h b/stream_wrapper.h
index c064423..cfa6c37 100644
--- a/stream_wrapper.h
+++ b/stream_wrapper.h
@@ -33,5 +33,17 @@ int virStreamSparseSendAllWrapper(virStreamPtr st, int callbackID, int
holeCallb
int virStreamSparseRecvAllWrapper(virStreamPtr st, int callbackID, int holeCallbackID);
int virStreamEventAddCallbackWrapper(virStreamPtr st, int events, int callbackID);
+int virStreamRecvFlagsWrapper(virStreamPtr st,
+ char *data,
+ size_t nbytes,
+ unsigned int flags);
+
+int virStreamSendHoleWrapper(virStreamPtr st,
+ long long length,
+ unsigned int flags);
+
+int virStreamRecvHoleWrapper(virStreamPtr,
+ long long *length,
+ unsigned int flags);
#endif /* LIBVIRT_GO_STREAM_WRAPPER_H__ */
--
2.17.1