Use __attribute__ consistently throughout.

3 files changed, 28 insertions, 28 deletions

diff --git a/lib/format_pool/disk_rep.c b/lib/format_pool/disk_rep.c
index adbae6d4e..2c16f50ea 100644
--- a/lib/format_pool/disk_rep.c
+++ b/lib/format_pool/disk_rep.c
@@ -34,10 +34,10 @@
 #define CPOUT_64(x, y) {(y) = xlate64_be((x));}
 
 static int __read_pool_disk(const struct format_type *fmt, struct device *dev,
-			    struct dm_pool *mem __attribute((unused)), struct pool_list *pl,
-			    const char *vg_name __attribute((unused)))
+			    struct dm_pool *mem __attribute__((unused)), struct pool_list *pl,
+			    const char *vg_name __attribute__((unused)))
 {
-	char buf[512] __attribute((aligned(8)));
+	char buf[512] __attribute__((aligned(8)));
 
 	/* FIXME: Need to check the cache here first */
 	if (!dev_read(dev, UINT64_C(0), 512, buf)) {
@@ -58,7 +58,7 @@ static void _add_pl_to_list(struct dm_list *head, struct pool_list *data)
 
 	dm_list_iterate_items(pl, head) {
 		if (id_equal(&data->pv_uuid, &pl->pv_uuid)) {
-			char uuid[ID_LEN + 7] __attribute((aligned(8)));
+			char uuid[ID_LEN + 7] __attribute__((aligned(8)));
 
 			id_write_format(&pl->pv_uuid, uuid, ID_LEN + 7);
 
@@ -84,7 +84,7 @@ int read_pool_label(struct pool_list *pl, struct labeller *l,
 	struct lvmcache_info *info;
 	struct id pvid;
 	struct id vgid;
-	char uuid[ID_LEN + 7] __attribute((aligned(8)));
+	char uuid[ID_LEN + 7] __attribute__((aligned(8)));
 	struct pool_disk *pd = &pl->pd;
 
 	pool_label_in(pd, buf);
diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c
index a0eb8278e..56626f5bf 100644
--- a/lib/format_pool/format_pool.c
+++ b/lib/format_pool/format_pool.c
@@ -158,7 +158,7 @@ static struct volume_group *_build_vg_from_pds(struct format_instance
 
 static struct volume_group *_pool_vg_read(struct format_instance *fid,
 				     const char *vg_name,
-				     struct metadata_area *mda __attribute((unused)))
+				     struct metadata_area *mda __attribute__((unused)))
 {
 	struct dm_pool *mem = dm_pool_create("pool vg_read", VG_MEMPOOL_CHUNK);
 	struct dm_list pds;
@@ -188,26 +188,26 @@ out:
 	return NULL;
 }
 
-static int _pool_pv_setup(const struct format_type *fmt __attribute((unused)),
-			  uint64_t pe_start __attribute((unused)),
-			  uint32_t extent_count __attribute((unused)),
-			  uint32_t extent_size __attribute((unused)),
-			  unsigned long data_alignment __attribute((unused)),
-			  unsigned long data_alignment_offset __attribute((unused)),
-			  int pvmetadatacopies __attribute((unused)),
-			  uint64_t pvmetadatasize __attribute((unused)),
-			  unsigned metadataignore __attribute((unused)),
-			  struct dm_list *mdas __attribute((unused)),
-			  struct physical_volume *pv __attribute((unused)),
-			  struct volume_group *vg __attribute((unused)))
+static int _pool_pv_setup(const struct format_type *fmt __attribute__((unused)),
+			  uint64_t pe_start __attribute__((unused)),
+			  uint32_t extent_count __attribute__((unused)),
+			  uint32_t extent_size __attribute__((unused)),
+			  unsigned long data_alignment __attribute__((unused)),
+			  unsigned long data_alignment_offset __attribute__((unused)),
+			  int pvmetadatacopies __attribute__((unused)),
+			  uint64_t pvmetadatasize __attribute__((unused)),
+			  unsigned metadataignore __attribute__((unused)),
+			  struct dm_list *mdas __attribute__((unused)),
+			  struct physical_volume *pv __attribute__((unused)),
+			  struct volume_group *vg __attribute__((unused)))
 {
 	return 1;
 }
 
 static int _pool_pv_read(const struct format_type *fmt, const char *pv_name,
 			 struct physical_volume *pv,
-			 struct dm_list *mdas __attribute((unused)),
-			 int scan_label_only __attribute((unused)))
+			 struct dm_list *mdas __attribute__((unused)),
+			 int scan_label_only __attribute__((unused)))
 {
 	struct dm_pool *mem = dm_pool_create("pool pv_read", 1024);
 	struct pool_list *pl;
@@ -249,9 +249,9 @@ static struct metadata_area_ops _metadata_format_pool_ops = {
 /* *INDENT-ON* */
 
 static struct format_instance *_pool_create_instance(const struct format_type *fmt,
-						const char *vgname __attribute((unused)),
-						const char *vgid __attribute((unused)),
-						void *private __attribute((unused)))
+						const char *vgname __attribute__((unused)),
+						const char *vgid __attribute__((unused)),
+						void *private __attribute__((unused)))
 {
 	struct format_instance *fid;
 	struct metadata_area *mda;
@@ -282,7 +282,7 @@ static struct format_instance *_pool_create_instance(const struct format_type *f
 	return fid;
 }
 
-static void _pool_destroy_instance(struct format_instance *fid __attribute((unused)))
+static void _pool_destroy_instance(struct format_instance *fid __attribute__((unused)))
 {
 }
 
diff --git a/lib/format_pool/pool_label.c b/lib/format_pool/pool_label.c
index 7b4cfacd1..2d34e6085 100644
--- a/lib/format_pool/pool_label.c
+++ b/lib/format_pool/pool_label.c
@@ -29,7 +29,7 @@ static void _pool_not_supported(const char *op)
 		  op);
 }
 
-static int _pool_can_handle(struct labeller *l __attribute((unused)), void *buf, uint64_t sector)
+static int _pool_can_handle(struct labeller *l __attribute__((unused)), void *buf, uint64_t sector)
 {
 
 	struct pool_disk pd;
@@ -50,7 +50,7 @@ static int _pool_can_handle(struct labeller *l __attribute((unused)), void *buf,
 	return 0;
 }
 
-static int _pool_write(struct label *label __attribute((unused)), void *buf __attribute((unused)))
+static int _pool_write(struct label *label __attribute__((unused)), void *buf __attribute__((unused)))
 {
 	_pool_not_supported("write");
 	return 0;
@@ -64,14 +64,14 @@ static int _pool_read(struct labeller *l, struct device *dev, void *buf,
 	return read_pool_label(&pl, l, dev, buf, label);
 }
 
-static int _pool_initialise_label(struct labeller *l __attribute((unused)), struct label *label)
+static int _pool_initialise_label(struct labeller *l __attribute__((unused)), struct label *label)
 {
 	strcpy(label->type, "POOL");
 
 	return 1;
 }
 
-static void _pool_destroy_label(struct labeller *l __attribute((unused)), struct label *label __attribute((unused)))
+static void _pool_destroy_label(struct labeller *l __attribute__((unused)), struct label *label __attribute__((unused)))
 {
 }