From 34cd4f9076dc2653c3d073ef7dcd3698463de783 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 17 Dec 2008 21:09:44 +0000
Subject: [PATCH] Remove trailing semi-colons causing empty statement warnings
 (John Levon)

---
 ChangeLog              |  7 +++++++
 src/domain_conf.c      |  2 +-
 src/node_device_conf.c |  4 ++--
 src/node_device_conf.h |  4 ++--
 src/storage_conf.c     | 14 +++++++-------
 src/storage_conf.h     | 14 +++++++-------
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30c35c6759..d3e7bf3173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 17 20:53:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* domain_conf.c, node_device_conf.c, node_device_conf.h,
+	storage_conf.c, storage_conf.h: Remove trailing semi-colon
+	causing empty statement compile warnings on solaris (John
+	Levon).
+
 Wed Dec 17 18:10:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	Anonymous union fixes for non-GCC compilers (John Levon)
diff --git a/src/domain_conf.c b/src/domain_conf.c
index d91a053eaf..eef5226da7 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -119,7 +119,7 @@ VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST,
 VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST,
               "sb16",
               "es1370",
-              "pcspk");
+              "pcspk")
 
 VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST,
               "mouse",
diff --git a/src/node_device_conf.c b/src/node_device_conf.c
index 526cd84588..9645c8917b 100644
--- a/src/node_device_conf.c
+++ b/src/node_device_conf.c
@@ -45,11 +45,11 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST,
               "net",
               "scsi_host",
               "scsi",
-              "storage");
+              "storage")
 
 VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST,
               "80203",
-              "80211");
+              "80211")
 
 
 #define virNodeDeviceLog(msg...) fprintf(stderr, msg)
diff --git a/src/node_device_conf.h b/src/node_device_conf.h
index 5addbab1ac..15a0757c04 100644
--- a/src/node_device_conf.h
+++ b/src/node_device_conf.h
@@ -47,8 +47,8 @@ enum virNodeDevNetCapType {
     VIR_NODE_DEV_CAP_NET_LAST
 };
 
-VIR_ENUM_DECL(virNodeDevCap);
-VIR_ENUM_DECL(virNodeDevNetCap);
+VIR_ENUM_DECL(virNodeDevCap)
+VIR_ENUM_DECL(virNodeDevNetCap)
 
 enum virNodeDevStorageCapFlags {
     VIR_NODE_DEV_CAP_STORAGE_REMOVABLE			= (1 << 0),
diff --git a/src/storage_conf.c b/src/storage_conf.c
index ca3e0b2aa5..2cd7eeceb8 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -54,26 +54,26 @@ VIR_ENUM_IMPL(virStoragePool,
               VIR_STORAGE_POOL_LAST,
               "dir", "fs", "netfs",
               "logical", "disk", "iscsi",
-              "scsi");
+              "scsi")
 
 VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
               VIR_STORAGE_POOL_FS_LAST,
               "auto", "ext2", "ext3",
               "ext4", "ufs", "iso9660", "udf",
-              "gfs", "gfs2", "vfat", "hfs+", "xfs");
+              "gfs", "gfs2", "vfat", "hfs+", "xfs")
 
 VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
               VIR_STORAGE_POOL_NETFS_LAST,
-              "auto", "nfs");
+              "auto", "nfs")
 
 VIR_ENUM_IMPL(virStoragePoolFormatDisk,
               VIR_STORAGE_POOL_DISK_LAST,
               "unknown", "dos", "dvh", "gpt",
-              "mac", "bsd", "pc98", "sun", "lvm2");
+              "mac", "bsd", "pc98", "sun", "lvm2")
 
 VIR_ENUM_IMPL(virStoragePoolFormatLogical,
               VIR_STORAGE_POOL_LOGICAL_LAST,
-              "unknown", "lvm2");
+              "unknown", "lvm2")
 
 
 VIR_ENUM_IMPL(virStorageVolFormatDisk,
@@ -81,13 +81,13 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk,
               "none", "linux", "fat16",
               "fat32", "linux-swap",
               "linux-lvm", "linux-raid",
-              "extended");
+              "extended")
 
 VIR_ENUM_IMPL(virStorageVolFormatFileSystem,
               VIR_STORAGE_VOL_FILE_LAST,
               "raw", "dir", "bochs",
               "cloop", "cow", "dmg", "iso",
-              "qcow", "qcow2", "vmdk", "vpc");
+              "qcow", "qcow2", "vmdk", "vpc")
 
 
 typedef const char *(*virStorageVolFormatToString)(int format);
diff --git a/src/storage_conf.h b/src/storage_conf.h
index 76ea9135b0..7956354cbc 100644
--- a/src/storage_conf.h
+++ b/src/storage_conf.h
@@ -113,7 +113,7 @@ enum virStoragePoolType {
     VIR_STORAGE_POOL_LAST,
 };
 
-VIR_ENUM_DECL(virStoragePool);
+VIR_ENUM_DECL(virStoragePool)
 
 
 enum virStoragePoolAuthType {
@@ -349,14 +349,14 @@ enum virStoragePoolFormatFileSystem {
     VIR_STORAGE_POOL_FS_XFS,
     VIR_STORAGE_POOL_FS_LAST,
 };
-VIR_ENUM_DECL(virStoragePoolFormatFileSystem);
+VIR_ENUM_DECL(virStoragePoolFormatFileSystem)
 
 enum virStoragePoolFormatFileSystemNet {
     VIR_STORAGE_POOL_NETFS_AUTO = 0,
     VIR_STORAGE_POOL_NETFS_NFS,
     VIR_STORAGE_POOL_NETFS_LAST,
 };
-VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet);
+VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet)
 
 enum virStoragePoolFormatDisk {
     VIR_STORAGE_POOL_DISK_UNKNOWN = 0,
@@ -371,14 +371,14 @@ enum virStoragePoolFormatDisk {
     VIR_STORAGE_POOL_DISK_LAST,
 };
 
-VIR_ENUM_DECL(virStoragePoolFormatDisk);
+VIR_ENUM_DECL(virStoragePoolFormatDisk)
 
 enum virStoragePoolFormatLogical {
     VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0,
     VIR_STORAGE_POOL_LOGICAL_LVM2 = 1,
     VIR_STORAGE_POOL_LOGICAL_LAST,
 };
-VIR_ENUM_DECL(virStoragePoolFormatLogical);
+VIR_ENUM_DECL(virStoragePoolFormatLogical)
 
 
 enum virStorageVolFormatFileSystem {
@@ -395,7 +395,7 @@ enum virStorageVolFormatFileSystem {
     VIR_STORAGE_VOL_FILE_VPC,
     VIR_STORAGE_VOL_FILE_LAST,
 };
-VIR_ENUM_DECL(virStorageVolFormatFileSystem);
+VIR_ENUM_DECL(virStorageVolFormatFileSystem)
 
 /*
  * XXX these are basically partition types.
@@ -417,7 +417,7 @@ enum virStorageVolFormatDisk {
     VIR_STORAGE_VOL_DISK_EXTENDED,
     VIR_STORAGE_VOL_DISK_LAST,
 };
-VIR_ENUM_DECL(virStorageVolFormatDisk);
+VIR_ENUM_DECL(virStorageVolFormatDisk)