[libvirt] [go PATCH 08/37] nwfilter binding: move wrapper functions out of compat header

[Daniel P. Berrangé]

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 nwfilter_binding.go                           |  1 +
 nwfilter_binding_compat.h                     | 11 ------
 ...g_compat.go => nwfilter_binding_wrapper.go |  1 +
 nwfilter_binding_wrapper.h                    | 38 +++++++++++++++++++
 4 files changed, 40 insertions(+), 11 deletions(-)
 rename nwfilter_binding_compat.go => nwfilter_binding_wrapper.go (98%)
 create mode 100644 nwfilter_binding_wrapper.h

diff --git a/nwfilter_binding.go b/nwfilter_binding.go
index 256ac19..daab598 100644
--- a/nwfilter_binding.go
+++ b/nwfilter_binding.go
@@ -31,6 +31,7 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <stdlib.h>
 #include "nwfilter_binding_compat.h"
+#include "nwfilter_binding_wrapper.h"
 */
 import "C"
 
diff --git a/nwfilter_binding_compat.h b/nwfilter_binding_compat.h
index 4aa138d..1d6fd16 100644
--- a/nwfilter_binding_compat.h
+++ b/nwfilter_binding_compat.h
@@ -30,15 +30,4 @@
 typedef struct _virNWFilterBinding *virNWFilterBindingPtr;
 #endif
 
-const char *virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding);
-const char *virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding);
-
-char *virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding,
-					 unsigned int flags);
-
-int virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding);
-int virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding);
-int virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding);
-
-
 #endif /* LIBVIRT_GO_NWFILTER_BINDING_COMPAT_H__ */
diff --git a/nwfilter_binding_compat.go b/nwfilter_binding_wrapper.go
similarity index 98%
rename from nwfilter_binding_compat.go
rename to nwfilter_binding_wrapper.go
index 37fcce0..4d0e086 100644
--- a/nwfilter_binding_compat.go
+++ b/nwfilter_binding_wrapper.go
@@ -30,6 +30,7 @@ package libvirt
 #include <libvirt/libvirt.h>
 #include <assert.h>
 #include "nwfilter_binding_compat.h"
+#include "nwfilter_binding_wrapper.h"
 
 const char *virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding)
 {
diff --git a/nwfilter_binding_wrapper.h b/nwfilter_binding_wrapper.h
new file mode 100644
index 0000000..be09dca
--- /dev/null
+++ b/nwfilter_binding_wrapper.h
@@ -0,0 +1,38 @@
+/*
+ * 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) 2018 Red Hat, Inc.
+ *
+ */
+
+#ifndef LIBVIRT_GO_NWFILTER_BINDING_WRAPPER_H__
+#define LIBVIRT_GO_NWFILTER_BINDING_WRAPPER_H__
+
+const char *virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding);
+const char *virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding);
+char *virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding,
+					 unsigned int flags);
+int virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding);
+int virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding);
+int virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding);
+
+
+#endif /* LIBVIRT_GO_NWFILTER_BINDING_WRAPPER_H__ */
-- 
2.17.1