shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

select: add message about 'help' field to get more help on each error hit during selection parsing

Browse Source 
Inform about 'help' to get more help about selection fields and operators
after each syntax error hit:

  "Use 'help' for selection to get more help."
This commit is contained in:
Peter Rajnoha 2014-06-23 12:12:01 +02:00
parent 69075d0b43
commit 9c3c357874
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libdm/libdm-report.c
View File

@ -2396,7 +2396,8 @@ out_reserved_values:
log_warn(" "); log_warn(" ");
} }
static char _sel_syntax_error_at_msg[] = "Selection syntax error at '%s'."; static const char _sel_syntax_error_at_msg[] = "Selection syntax error at '%s'.";
static const char _sel_help_ref_msg[] = "Use \'help\' for selection to get more help.";
/* /*
* Selection parser * Selection parser
@ -2460,6 +2461,8 @@ static struct selection_node *_parse_selection(struct dm_report *rh,
c = we[0]; c = we[0];
tmp = (char *) we; tmp = (char *) we;
tmp[0] = '\0'; tmp[0] = '\0';
_display_fields(rh, 0, 1);
log_warn(" ");
log_error("Selection field is uncomparable: %s.", ws); log_error("Selection field is uncomparable: %s.", ws);
tmp[0] = c; tmp[0] = c;
goto bad; goto bad;
@ -2522,6 +2525,7 @@ static struct selection_node *_parse_selection(struct dm_report *rh,
return sn; return sn;
bad: bad:
log_error(_sel_syntax_error_at_msg, s); log_error(_sel_syntax_error_at_msg, s);
log_error(_sel_help_ref_msg);
*next = s; *next = s;
return NULL; return NULL;
} }
@ -2695,6 +2699,7 @@ struct dm_report *dm_report_init_with_selection(uint32_t *report_types,
if (*next) { if (*next) {
log_error("Expecting logical operator"); log_error("Expecting logical operator");
log_error(_sel_syntax_error_at_msg, next); log_error(_sel_syntax_error_at_msg, next);
log_error(_sel_help_ref_msg);
goto error; goto error;
} }