Revert the default statement for PIN type checking

Also fix the coding style for the switch statement and remove the
number assignment for an internal enum.
This commit is contained in:
Marcel Holtmann 2010-03-20 02:26:57 +01:00
parent d6e78f7828
commit 256c6e14c7
2 changed files with 5 additions and 8 deletions

View File

@ -592,8 +592,7 @@ gboolean is_valid_pin(const char *pin, enum pin_type type)
if (i != strspn(pin, "012345679"))
return FALSE;
switch (type)
{
switch (type) {
case PIN_TYPE_PIN:
/* 11.11 Section 9.3 ("CHV"): 4..8 IA-5 digits */
if (4 <= i && i <= 8)
@ -613,8 +612,6 @@ gboolean is_valid_pin(const char *pin, enum pin_type type)
if (i < 8)
return TRUE;
break;
default:
break;
}
return FALSE;

View File

@ -116,10 +116,10 @@ enum ss_cssu {
};
enum pin_type {
PIN_TYPE_NONE = 0,
PIN_TYPE_PIN = 1,
PIN_TYPE_PUK = 2,
PIN_TYPE_NET = 3,
PIN_TYPE_NONE,
PIN_TYPE_PIN,
PIN_TYPE_PUK,
PIN_TYPE_NET,
};
const char *telephony_error_to_str(const struct ofono_error *error);