diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 3d1eee158..119016aff 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -19,7 +19,6 @@ Version 1.02.88 - Document env var 'DM_DEFAULT_NAME_MANGLING_MODE' in dmsetup man page. Warn user about incorrect use of cookie with 'dmsetup remove --force'. Also recognize 'help'/'?' as reserved sort key name to show help. - Export recognized DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} to show help. Add dm_units_to_factor for size unit parsing. Increase bitset size for minors for thin dmeventd plugin. diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index fab10719b..90e0b5190 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1642,10 +1642,6 @@ struct dm_report_field; #define DM_REPORT_FIELD_TYPE_ID_LEN 32 #define DM_REPORT_FIELD_TYPE_HEADING_LEN 32 -/* Reserved field names for special purposes. */ -#define DM_REPORT_FIELD_RESERVED_NAME_HELP "help" /* shows help */ -#define DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT "?" /* shows help */ - struct dm_report; struct dm_report_field_type { uint32_t type; /* object type id */ diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 8e46f78a1..012dca464 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -194,8 +194,8 @@ struct row { */ #define COMMON_REPORT_TYPE 0x80000000 #define COMMON_FIELD_SELECTED_ID "selected" -#define COMMON_FIELD_HELP_ID DM_REPORT_FIELD_RESERVED_NAME_HELP -#define COMMON_FIELD_HELP_ALT_ID DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT +#define COMMON_FIELD_HELP_ID "help" +#define COMMON_FIELD_HELP_ALT_ID "?" static void *_null_returning_fn(void *obj __attribute__((unused))) { @@ -2663,8 +2663,8 @@ struct dm_report *dm_report_init_with_selection(uint32_t *report_types, } rh->reserved_values = reserved_values; - if (!strcasecmp(selection, DM_REPORT_FIELD_RESERVED_NAME_HELP) || - !strcmp(selection, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) { + if (!strcasecmp(selection, COMMON_FIELD_HELP_ID) || + !strcmp(selection, COMMON_FIELD_HELP_ALT_ID)) { _display_fields(rh, 0, 1); log_warn(" "); _display_selection_help(rh);