Fix compile errors in remote.c and newly added audit code

diff --git a/daemon/remote.c b/daemon/remote.c
index 44609c72a9fea7c7a2f078b8d3f823e1e3805f57..75df9b5a93c341a2e2672b76d2e9cdd1f3e27631 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2233,8 +2233,6 @@ remoteDispatchDomainReboot (struct qemud_server *server ATTRIBUTE_UNUSED,
                             void *ret ATTRIBUTE_UNUSED)
 {
     virDomainPtr dom;
-    char uuidstr[VIR_UUID_STRING_BUFLEN];
-    int r;
 
     dom = get_nonnull_domain (conn, args->dom);
     if (dom == NULL) {
@@ -2286,6 +2284,8 @@ remoteDispatchDomainResume (struct qemud_server *server ATTRIBUTE_UNUSED,
                             void *ret ATTRIBUTE_UNUSED)
 {
     virDomainPtr dom;
+    char uuidstr[VIR_UUID_STRING_BUFLEN];
+    int r;
 
     dom = get_nonnull_domain (conn, args->dom);
     if (dom == NULL) {

diff --git a/src/util/virtaudit.c b/src/util/virtaudit.c
index 036a8b9f41c169b161f2338bfd51659c327491de..965a6e8bcd1aaffd3fb0aac50a18eef3844b98b0 100644 (file)
--- a/src/util/virtaudit.c
+++ b/src/util/virtaudit.c
@@ -1,5 +1,5 @@
 /*
- * audit.h: auditing support
+ * virtaudit.c: auditing support
  *
  * Copyright (C) 2010 Red Hat, Inc.
  *
@@ -80,7 +80,7 @@ void virAuditSend(const char *file ATTRIBUTE_UNUSED, const char *func, size_t li
 void virAuditSend(const char *file ATTRIBUTE_UNUSED, const char *func, size_t linenr,
                   const char *clienttty ATTRIBUTE_UNUSED,
                   const char *clientaddr ATTRIBUTE_UNUSED,
-                  enum virAuditRecordType type, bool success,
+                  enum virAuditRecordType type ATTRIBUTE_UNUSED, bool success,
                   const char *fmt, ...)
 #endif
 {

diff --git a/src/util/virtaudit.h b/src/util/virtaudit.h
index b0cb707815e3a4c6f197a5911d818c94f0b6d0b1..f0d9cd7fd2cabee5edf169738baf5ad7d6a2f7f0 100644 (file)
--- a/src/util/virtaudit.h
+++ b/src/util/virtaudit.h
@@ -1,5 +1,5 @@
 /*
- * audit.h: auditing support
+ * virtaudit.h: auditing support
  *
  * Copyright (C) 2010 Red Hat, Inc.
  *