[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 4/5] build: consistently use C99 varargs macros in xen



Continuation of previous patch.

* src/xen/proxy_internal.c (virProxyError): Use C99 rather than
GNU vararg macro syntax.
* src/xen/sexpr.c (virSexprError): Likewise.
* src/xen/xen_driver.c (xenUnifiedError): Likewise.
* src/xen/xen_hypervisor.c (virXenError): Likewise.
* src/xen/xen_inotify.c (virXenInotifyError): Likewise.
* src/xen/xend_internal.c (virXendError): Likewise.
* src/xen/xm_internal.c (xenXMError): Likewise.
* src/xen/xs_internal.c (virXenStoreError): Likewise.
---
 src/xen/proxy_internal.c |    4 ++--
 src/xen/sexpr.c          |    9 ++++-----
 src/xen/xen_driver.c     |    4 ++--
 src/xen/xen_hypervisor.c |    6 +++---
 src/xen/xen_inotify.c    |    5 +++--
 src/xen/xend_internal.c  |    9 ++++-----
 src/xen/xm_internal.c    |    6 +++---
 src/xen/xs_internal.c    |    4 ++--
 8 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c
index 8e1c226..109b99b 100644
--- a/src/xen/proxy_internal.c
+++ b/src/xen/proxy_internal.c
@@ -92,9 +92,9 @@ struct xenUnifiedDriver xenProxyDriver = {
  *									*
  ************************************************************************/

-#define virProxyError(conn, code, fmt...)                                    \
+#define virProxyError(conn, code, ...)                                     \
         virReportErrorHelper(conn, VIR_FROM_PROXY, code, __FILE__,         \
-                               __FUNCTION__, __LINE__, fmt)
+                               __FUNCTION__, __LINE__, __VA_ARGS__)

 /************************************************************************
  *									*
diff --git a/src/xen/sexpr.c b/src/xen/sexpr.c
index 840d3e5..7e370db 100644
--- a/src/xen/sexpr.c
+++ b/src/xen/sexpr.c
@@ -1,9 +1,8 @@
 /*
  * sexpr.c : S-Expression routines to communicate with the Xen Daemon
  *
- * Copyright (C) 2005
- *
- *      Anthony Liguori <aliguori us ibm com>
+ * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2005 Anthony Liguori <aliguori us ibm com>
  *
  *  This file is subject to the terms and conditions of the GNU Lesser General
  *  Public License. See the file COPYING.LIB in the main directory of this
@@ -25,9 +24,9 @@

 #define VIR_FROM_THIS VIR_FROM_SEXPR

-#define virSexprError(code, fmt...)                                          \
+#define virSexprError(code, ...)                                           \
         virReportErrorHelper(NULL, VIR_FROM_SEXPR, code, __FILE__,         \
-                               __FUNCTION__, __LINE__, fmt)
+                               __FUNCTION__, __LINE__, __VA_ARGS__)

 /**
  * sexpr_new:
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 700682c..eac485f 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -72,9 +72,9 @@ static struct xenUnifiedDriver const * const drivers[XEN_UNIFIED_NR_DRIVERS] = {

 static int inside_daemon;

-#define xenUnifiedError(conn, code, fmt...)                                  \
+#define xenUnifiedError(conn, code, ...)                                   \
         virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__,           \
-                               __FUNCTION__, __LINE__, fmt)
+                               __FUNCTION__, __LINE__, __VA_ARGS__)

 /**
  * xenNumaInit:
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index ab8fbc3..fe49ac2 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -803,10 +803,10 @@ struct xenUnifiedDriver xenHypervisorDriver = {
 };
 #endif /* !PROXY */

-#define virXenError(conn, code, fmt...)                                      \
-        if (in_init == 0)                                                    \
+#define virXenError(conn, code, ...)                                       \
+        if (in_init == 0)                                                  \
             virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__,       \
-                                   __FUNCTION__, __LINE__, fmt)
+                                 __FUNCTION__, __LINE__, __VA_ARGS__)

 #ifndef PROXY

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index de91dc6..ee24bc4 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -4,6 +4,7 @@
  *                /etc/xen
  *                /var/lib/xend/domains
  *
+ * Copyright (C) 2010 Red Hat, Inc.
  * Copyright (C) 2008 VirtualIron
  *
  * This library is free software; you can redistribute it and/or
@@ -43,9 +44,9 @@

 #define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY

-#define virXenInotifyError(conn, code, fmt...)                                 \
+#define virXenInotifyError(conn, code, ...)                                   \
         virReportErrorHelper(NULL, VIR_FROM_XEN_INOTIFY, code, __FILE__,      \
-                               __FUNCTION__, __LINE__, fmt)
+                             __FUNCTION__, __LINE__, __VA_ARGS__)

 struct xenUnifiedDriver xenInotifyDriver = {
     xenInotifyOpen, /* open */
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 5f46e9f..cd7177b 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1,9 +1,8 @@
 /*
  * xend_internal.c: access to Xen though the Xen Daemon interface
  *
- * Copyright (C) 2005
- *
- *      Anthony Liguori <aliguori us ibm com>
+ * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2005 Anthony Liguori <aliguori us ibm com>
  *
  *  This file is subject to the terms and conditions of the GNU Lesser General
  *  Public License. See the file COPYING.LIB in the main directory of this
@@ -99,9 +98,9 @@ virDomainXMLDevID(virDomainPtr domain,
                   int ref_len);
 #endif

-#define virXendError(conn, code, fmt...)                                     \
+#define virXendError(conn, code, ...)                                      \
         virReportErrorHelper(conn, VIR_FROM_XEND, code, __FILE__,          \
-                               __FUNCTION__, __LINE__, fmt)
+                             __FUNCTION__, __LINE__, __VA_ARGS__)

 #define virXendErrorInt(conn, code, ival)                                    \
         virXendError(conn, code, "%d", ival)
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 014cbfc..4d12071 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -1,7 +1,7 @@
 /*
  * xm_internal.h: helper routines for dealing with inactive domains
  *
- * Copyright (C) 2006-2007, 2009 Red Hat
+ * Copyright (C) 2006-2007, 2009, 2010 Red Hat
  * Copyright (C) 2006 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -120,9 +120,9 @@ struct xenUnifiedDriver xenXMDriver = {
     NULL, /* domainSetSchedulerParameters */
 };

-#define xenXMError(conn, code, fmt...)                                       \
+#define xenXMError(conn, code, ...)                                        \
         virReportErrorHelper(conn, VIR_FROM_XENXM, code, __FILE__,         \
-                               __FUNCTION__, __LINE__, fmt)
+                             __FUNCTION__, __LINE__, __VA_ARGS__)

 #ifndef WITH_XEN_INOTIFY
 static int xenInotifyActive(virConnectPtr conn ATTRIBUTE_UNUSED)
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index c840225..0c62565 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -87,9 +87,9 @@ struct xenUnifiedDriver xenStoreDriver = {

 #endif /* ! PROXY */

-#define virXenStoreError(conn, code, fmt...)                                 \
+#define virXenStoreError(conn, code, ...)                                  \
         virReportErrorHelper(NULL, VIR_FROM_XENSTORE, code, __FILE__,      \
-                               __FUNCTION__, __LINE__, fmt)
+                             __FUNCTION__, __LINE__, __VA_ARGS__)

 /************************************************************************
  *									*
-- 
1.6.6.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]