diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-04-28 10:17:30 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-04-28 12:42:56 +0200 |
| commit | d8214cb1546f942cc7cbcfb4849b4549132d74a0 (patch) | |
| tree | cbe12df6d71b5a35729b86fb2bc23c2009a6fbd5 /lib/display | |
| parent | d1aba7ccf6d1bc5f3bc1fa1b5fe70eec64f8c633 (diff) | |
| download | lvm2-d8214cb1546f942cc7cbcfb4849b4549132d74a0.tar.gz | |
cleanup: put all tests within switch
No reason to check for VALID in extra if.
Diffstat (limited to 'lib/display')
| -rw-r--r-- | lib/display/display.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/lib/display/display.c b/lib/display/display.c index 36274b6ef..b83bb5926 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -840,30 +840,31 @@ void display_tags(const struct cmd_context *cmd) void display_name_error(name_error_t name_error) { - if (name_error != NAME_VALID) { - switch(name_error) { - case NAME_INVALID_EMPTY: - log_error("Name is zero length"); - break; - case NAME_INVALID_HYPEN: - log_error("Name cannot start with hyphen"); - break; - case NAME_INVALID_DOTS: - log_error("Name starts with . or .. and has no " - "following character(s)"); - break; - case NAME_INVALID_CHARSET: - log_error("Name contains invalid character, valid set includes: " - "[a-zA-Z0-9.-_+]"); - break; - case NAME_INVALID_LENGTH: - /* Report that name length -1 to accommodate nul*/ - log_error("Name length exceeds maximum limit of %d", (NAME_LEN -1)); - break; - default: - log_error("Unknown error %d on name validation", name_error); - break; - } + switch(name_error) { + case NAME_VALID: + /* Valid name */ + break; + case NAME_INVALID_EMPTY: + log_error("Name is zero length."); + break; + case NAME_INVALID_HYPEN: + log_error("Name cannot start with hyphen."); + break; + case NAME_INVALID_DOTS: + log_error("Name starts with . or .. and has no " + "following character(s)."); + break; + case NAME_INVALID_CHARSET: + log_error("Name contains invalid character, valid set includes: " + "[a-zA-Z0-9.-_+]."); + break; + case NAME_INVALID_LENGTH: + /* Report that name length - 1 to accommodate nul*/ + log_error("Name length exceeds maximum limit of %d.", (NAME_LEN - 1)); + break; + default: + log_error(INTERNAL_ERROR "Unknown error %d on name validation.", name_error); + break; } } |