From fc2063b6606fc724ce6c074dc2eac434808b5a5e Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Tue, 12 Jun 2007 21:39:49 +0000 Subject: [PATCH] Change PV_HANDLE_DEREF to pv_field and add paren's --- lib/metadata/metadata.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index b7f654b57..38c4b3386 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -29,10 +29,10 @@ #include /* - * FIXME: Check for valid handle before dereferencing member or log error? + * FIXME: Check for valid handle before dereferencing field or log error? */ -#define PV_HANDLE_DEREF(H, M) \ - (((struct physical_volume *)H)->M) +#define pv_field(handle, field) \ + (((struct physical_volume *)(handle))->field) static struct physical_volume *_pv_read(struct cmd_context *cmd, const char *pv_name, @@ -1746,55 +1746,55 @@ int vg_check_status(struct volume_group *vg, uint32_t status_flags) */ struct id get_pv_id (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, id); + return pv_field(pv_handle, id); } const struct format_type *get_pv_format_type (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, fmt); + return pv_field(pv_handle, fmt); } struct id get_pv_vgid (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, vgid); + return pv_field(pv_handle, vgid); } struct device *get_pv_dev (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, dev); + return pv_field(pv_handle, dev); } const char *get_pv_vg_name (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, vg_name); + return pv_field(pv_handle, vg_name); } uint64_t get_pv_size(void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, size); + return pv_field(pv_handle, size); } uint32_t get_pv_status (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, status); + return pv_field(pv_handle, status); } uint32_t get_pv_pe_size (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, pe_size); + return pv_field(pv_handle, pe_size); } uint64_t get_pv_pe_start (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, pe_start); + return pv_field(pv_handle, pe_start); } uint32_t get_pv_pe_count (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, pe_count); + return pv_field(pv_handle, pe_count); } uint32_t get_pv_pe_alloc_count (void *pv_handle) { - return PV_HANDLE_DEREF(pv_handle, pe_alloc_count); + return pv_field(pv_handle, pe_alloc_count); } -- 2.43.5