Convert pv_handle_t to pv_t * and tidy up whitespace

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 6389177dec3c2484a3898cdf621625e4f7afc0c6..5ed206fc98909c7b67f0c33f5bcb4b7cc6b4794d 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -586,7 +586,7 @@ int vg_split_mdas(struct cmd_context *cmd, struct volume_group *vg_from,
  * Note:
  *   FIXME - liblvm todo - tidy up arguments for external use (fmt, mdas, etc)
  */
-pv_handle_t pv_create(const struct format_type *fmt,
+pv_t *pv_create(const struct format_type *fmt,
                struct device *dev,
                struct id *id, uint64_t size,
                uint64_t pe_start,
@@ -595,7 +595,7 @@ pv_handle_t pv_create(const struct format_type *fmt,
                int pvmetadatacopies,
                uint64_t pvmetadatasize, struct list *mdas)
 {
-       return (pv_handle_t) _pv_create(fmt, dev, id, size, pe_start, 
+       return (pv_t *) _pv_create(fmt, dev, id, size, pe_start, 
                                        existing_extent_count,
                                        existing_extent_size,
                                        pvmetadatacopies,
@@ -719,9 +719,9 @@ int pv_is_in_vg(struct volume_group *vg, struct physical_volume *pv)
  * Note
  *   FIXME - liblvm todo - make into function that takes VG handle
  */
-pv_handle_t find_pv_in_vg_by_uuid(struct volume_group *vg, struct id *id)
+pv_t *find_pv_in_vg_by_uuid(struct volume_group *vg, struct id *id)
 {
-       return (pv_handle_t) _find_pv_in_vg_by_uuid(vg, id);
+       return (pv_t *) _find_pv_in_vg_by_uuid(vg, id);
 }
 
 
@@ -1773,57 +1773,57 @@ int vg_check_status(struct volume_group *vg, uint32_t status_flags)
 /*
  * Gets/Sets for external LVM library
  */
-struct id get_pv_id (pv_handle_t pv_handle)
+struct id get_pv_id(pv_t *pv)
 {
-       return pv_field(pv_handle, id);
+       return pv_field(pv, id);
 }
 
-const struct format_type *get_pv_format_type (pv_handle_t pv_handle)
+const struct format_type *get_pv_format_type(pv_t *pv)
 {
-       return pv_field(pv_handle, fmt);
+       return pv_field(pv, fmt);
 }
 
-struct id get_pv_vgid (pv_handle_t pv_handle)
+struct id get_pv_vgid(pv_t *pv)
 {
-       return pv_field(pv_handle, vgid);
+       return pv_field(pv, vgid);
 }
 
-struct device *get_pv_dev (pv_handle_t pv_handle)
+struct device *get_pv_dev(pv_t *pv)
 {
-       return pv_field(pv_handle, dev);
+       return pv_field(pv, dev);
 }
 
-const char *get_pv_vg_name (pv_handle_t pv_handle)
+const char *get_pv_vg_name(pv_t *pv)
 {
-       return pv_field(pv_handle, vg_name);
+       return pv_field(pv, vg_name);
 }
 
-uint64_t get_pv_size(pv_handle_t pv_handle)
+uint64_t get_pv_size(pv_t *pv)
 {
-       return pv_field(pv_handle, size);
+       return pv_field(pv, size);
 }
 
-uint32_t get_pv_status (pv_handle_t pv_handle)
+uint32_t get_pv_status(pv_t *pv)
 {
-       return pv_field(pv_handle, status);
+       return pv_field(pv, status);
 }
 
-uint32_t get_pv_pe_size (pv_handle_t pv_handle)
+uint32_t get_pv_pe_size(pv_t *pv)
 {
-       return pv_field(pv_handle, pe_size);
+       return pv_field(pv, pe_size);
 }
 
-uint64_t get_pv_pe_start (pv_handle_t pv_handle)
+uint64_t get_pv_pe_start(pv_t *pv)
 {
-       return pv_field(pv_handle, pe_start);
+       return pv_field(pv, pe_start);
 }
 
-uint32_t get_pv_pe_count (pv_handle_t pv_handle)
+uint32_t get_pv_pe_count(pv_t *pv)
 {
-       return pv_field(pv_handle, pe_count);
+       return pv_field(pv, pe_count);
 }
 
-uint32_t get_pv_pe_alloc_count (pv_handle_t pv_handle)
+uint32_t get_pv_pe_alloc_count(pv_t *pv)
 {
-       return pv_field(pv_handle, pe_alloc_count);
+       return pv_field(pv, pe_alloc_count);
 }

diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 5f3b08e605de30bfa32f1f6d9821bde89181c8ba..ac2b472a6041214698b0f926ed7310b021e34d9b 100644 (file)
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -142,7 +142,7 @@ struct physical_volume {
        struct list tags;
 };
 
-typedef struct physical_volume * pv_handle_t;
+typedef struct physical_volume pv_t;
 struct metadata_area;
 struct format_instance;
 
@@ -439,7 +439,7 @@ int pv_write_orphan(struct cmd_context *cmd, struct physical_volume *pv);
 
 /* pe_start and pe_end relate to any existing data so that new metadata
  * areas can avoid overlap */
-pv_handle_t pv_create(const struct format_type *fmt,
+pv_t *pv_create(const struct format_type *fmt,
                      struct device *dev,
                      struct id *id,
                      uint64_t size,
@@ -501,7 +501,7 @@ struct physical_volume *pv_find(struct volume_group *vg, const char *pv_name);
 
 /* Find a PV within a given VG */
 struct pv_list *find_pv_in_vg(struct volume_group *vg, const char *pv_name);
-pv_handle_t find_pv_in_vg_by_uuid(struct volume_group *vg, struct id *id);
+pv_t *find_pv_in_vg_by_uuid(struct volume_group *vg, struct id *id);
 int get_pv_from_vg_by_id(const struct format_type *fmt, const char *vg_name,
                         const char *vgid, const char *pvid,
                         struct physical_volume *pv);
@@ -638,16 +638,16 @@ char *generate_lv_name(struct volume_group *vg, const char *format,
 /*
  * Gets/Sets for external LVM library
  */
-struct id get_pv_id (pv_handle_t pv_handle);
-const struct format_type *get_pv_format_type (pv_handle_t pv_handle);
-struct id get_pv_vgid (pv_handle_t pv_handle);
-struct device *get_pv_dev (pv_handle_t pv_handle);
-const char *get_pv_vg_name (pv_handle_t pv_handle);
-uint64_t get_pv_size(pv_handle_t pv_handle);
-uint32_t get_pv_status (pv_handle_t pv_handle);
-uint32_t get_pv_pe_size (pv_handle_t pv_handle);
-uint64_t get_pv_pe_start (pv_handle_t pv_handle);
-uint32_t get_pv_pe_count (pv_handle_t pv_handle);
-uint32_t get_pv_pe_alloc_count (pv_handle_t pv_handle);
+struct id get_pv_id(pv_t *pv);
+const struct format_type *get_pv_format_type(pv_t *pv);
+struct id get_pv_vgid(pv_t *pv);
+struct device *get_pv_dev(pv_t *pv);
+const char *get_pv_vg_name(pv_t *pv);
+uint64_t get_pv_size(pv_t *pv);
+uint32_t get_pv_status(pv_t *pv);
+uint32_t get_pv_pe_size(pv_t *pv);
+uint64_t get_pv_pe_start(pv_t *pv);
+uint32_t get_pv_pe_count(pv_t *pv);
+uint32_t get_pv_pe_alloc_count(pv_t *pv);
 
 #endif