shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

cleanup: put all tests within switch

Browse Source 
No reason to check for VALID in extra if.
This commit is contained in:
Zdenek Kabelac 2014-04-28 10:17:30 +02:00
parent d1aba7ccf6
commit d8214cb154
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/display/display.c
View File

@ -840,30 +840,31 @@ void display_tags(const struct cmd_context *cmd)
void display_name_error(name_error_t name_error) void display_name_error(name_error_t name_error)
{ {
if (name_error != NAME_VALID) { switch(name_error) {
switch(name_error) { case NAME_VALID:
case NAME_INVALID_EMPTY: /* Valid name */
log_error("Name is zero length"); break;
break; case NAME_INVALID_EMPTY:
case NAME_INVALID_HYPEN: log_error("Name is zero length.");
log_error("Name cannot start with hyphen"); break;
break; case NAME_INVALID_HYPEN:
case NAME_INVALID_DOTS: log_error("Name cannot start with hyphen.");
log_error("Name starts with . or .. and has no " break;
"following character(s)"); case NAME_INVALID_DOTS:
break; log_error("Name starts with . or .. and has no "
case NAME_INVALID_CHARSET: "following character(s).");
log_error("Name contains invalid character, valid set includes: " break;
"[a-zA-Z0-9.-_+]"); case NAME_INVALID_CHARSET:
break; log_error("Name contains invalid character, valid set includes: "
case NAME_INVALID_LENGTH: "[a-zA-Z0-9.-_+].");
/* Report that name length -1 to accommodate nul*/ break;
log_error("Name length exceeds maximum limit of %d", (NAME_LEN -1)); case NAME_INVALID_LENGTH:
break; /* Report that name length - 1 to accommodate nul*/
default: log_error("Name length exceeds maximum limit of %d.", (NAME_LEN - 1));
log_error("Unknown error %d on name validation", name_error); break;
break; default:
} log_error(INTERNAL_ERROR "Unknown error %d on name validation.", name_error);
break;
} }
} }