From d6fbd0db328003a20b895fcbe654ac49d446df79 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Fri, 20 Aug 2010 12:44:30 +0000 Subject: [PATCH] Add macro definitions to report infrastructure for character array length. Rather than hard code the size of the field, use a #define, so we can re-use. The #define will be needed in a future patch when we extend the reporting infrastructure to have 'get' and 'set' functions for each field, allowing lvm2app functions which query any report field. In order to provide a generic lookup based on the field id, we will define a type containing this field id, and thus, we will need to re-use the length of this string as it's defined inside libdevmapper.h. --- libdm/libdevmapper.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index e535d2bca..38b901f39 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1048,14 +1048,19 @@ struct dm_report_field; #define DM_REPORT_FIELD_TYPE_STRING 0x00000010 #define DM_REPORT_FIELD_TYPE_NUMBER 0x00000020 +#define DM_REPORT_FIELD_TYPE_ID_LEN 32 +#define DM_REPORT_FIELD_TYPE_HEADING_LEN 32 + struct dm_report; struct dm_report_field_type { uint32_t type; /* object type id */ uint32_t flags; /* DM_REPORT_FIELD_* */ uint32_t offset; /* byte offset in the object */ int32_t width; /* default width */ - const char id[32]; /* string used to specify the field */ - const char heading[32]; /* string printed in header */ + /* string used to specify the field */ + const char id[DM_REPORT_FIELD_TYPE_ID_LEN]; + /* string printed in header */ + const char heading[DM_REPORT_FIELD_TYPE_HEADING_LEN]; int (*report_fn)(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, const void *data, void *private_data);