Unify int types handling in protocol files

Some of the protocol files already include handing of the missing int
types such as xdr_uint64_t, some don't. To fix it everywhere, move out
of the appropriate defines to the utils/virxdrdefs.h file and include
it where needed.

Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index af22fc17ba5261d4fab98f9cda1f9706f7d5f408..aa5ab6929b91a13badf7c41dcd7cc3539076c504 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,6 +171,7 @@ UTIL_SOURCES =                                                      \
                util/viruri.h util/viruri.c                     \
                util/virutil.c util/virutil.h                   \
                util/viruuid.c util/viruuid.h                   \
+               util/virxdrdefs.h                               \
                util/virxml.c util/virxml.h                     \
                $(NULL)
 

diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x
index 878983d2ec74a88d2040c43ed1855aa379fdf61f..711201acc4cdc19b0a8cf13c381551d79646a325 100644 (file)
--- a/src/admin/admin_protocol.x
+++ b/src/admin/admin_protocol.x
@@ -22,6 +22,8 @@
  * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
+%#include "virxdrdefs.h"
+
 /*----- Data types. -----*/
 
 /* Length of long, but not unbounded, strings.

diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x
index 205d7c2c7f74848967b6bf72ac3e2233d8acc621..5e3d5d99835ab45526f5004e4b9645646d6cdd4c 100644 (file)
--- a/src/lxc/lxc_monitor_protocol.x
+++ b/src/lxc/lxc_monitor_protocol.x
@@ -4,24 +4,7 @@
  * the libvirt_lxc helper program.
  */
 
-/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
- * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
- */
-%#ifdef HAVE_XDR_U_INT64_T
-%# define xdr_uint64_t xdr_u_int64_t
-%#endif
-%#ifndef IXDR_PUT_INT32
-%# define IXDR_PUT_INT32 IXDR_PUT_LONG
-%#endif
-%#ifndef IXDR_GET_INT32
-%# define IXDR_GET_INT32 IXDR_GET_LONG
-%#endif
-%#ifndef IXDR_PUT_U_INT32
-%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-%#endif
-%#ifndef IXDR_GET_U_INT32
-%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-%#endif
+%#include "virxdrdefs.h"
 
 enum virLXCMonitorExitStatus {
     VIR_LXC_MONITOR_EXIT_STATUS_ERROR,

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 80f4a8b3a18191100132ed17dafaadb12e1af0d0..9f131f87fbb0039da9133376b9937f3a3ab2d3f1 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -38,27 +38,9 @@
 
 %#include <libvirt/libvirt.h>
 %#include "internal.h"
+%#include "virxdrdefs.h"
 %#include <arpa/inet.h>
 
-/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
- * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
- */
-%#ifdef HAVE_XDR_U_INT64_T
-%# define xdr_uint64_t xdr_u_int64_t
-%#endif
-%#ifndef IXDR_PUT_INT32
-%# define IXDR_PUT_INT32 IXDR_PUT_LONG
-%#endif
-%#ifndef IXDR_GET_INT32
-%# define IXDR_GET_INT32 IXDR_GET_LONG
-%#endif
-%#ifndef IXDR_PUT_U_INT32
-%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-%#endif
-%#ifndef IXDR_GET_U_INT32
-%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-%#endif
-
 /*----- Data types. -----*/
 
 /* Length of long, but not unbounded, strings.

diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x
index 7b6f753ba773d56f836d0c4442ec955688f92649..327a33475bfd196df533f4418704163a4b06da95 100644 (file)
--- a/src/rpc/virnetprotocol.x
+++ b/src/rpc/virnetprotocol.x
@@ -21,27 +21,9 @@
  */
 
 %#include "internal.h"
+%#include "virxdrdefs.h"
 %#include <arpa/inet.h>
 
-/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
- * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
- */
-%#ifdef HAVE_XDR_U_INT64_T
-%# define xdr_uint64_t xdr_u_int64_t
-%#endif
-%#ifndef IXDR_PUT_INT32
-%# define IXDR_PUT_INT32 IXDR_PUT_LONG
-%#endif
-%#ifndef IXDR_GET_INT32
-%# define IXDR_GET_INT32 IXDR_GET_LONG
-%#endif
-%#ifndef IXDR_PUT_U_INT32
-%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-%#endif
-%#ifndef IXDR_GET_U_INT32
-%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-%#endif
-
 /*----- Data types. -----*/
 
 /* Initial message size.

diff --git a/src/util/virxdrdefs.h b/src/util/virxdrdefs.h
new file mode 100644 (file)
index 0000000..40074dd
--- /dev/null
+++ b/src/util/virxdrdefs.h
@@ -0,0 +1,43 @@
+/*
+ * virxdrdefs.h
+ *
+ * Copyright (C) 2016 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VIR_XDRDEFS_H__
+# define __VIR_XDRDEFS_H__
+
+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
+ */
+# ifdef HAVE_XDR_U_INT64_T
+#  define xdr_uint64_t xdr_u_int64_t
+# endif
+# ifndef IXDR_PUT_INT32
+#  define IXDR_PUT_INT32 IXDR_PUT_LONG
+# endif
+# ifndef IXDR_GET_INT32
+#  define IXDR_GET_INT32 IXDR_GET_LONG
+# endif
+# ifndef IXDR_PUT_U_INT32
+#  define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
+# endif
+# ifndef IXDR_GET_U_INT32
+#  define IXDR_GET_U_INT32 IXDR_GET_U_LONG
+# endif
+
+#endif /* __VIR_XDRDEFS_H__ */