From 256c6e14c7947a10833cfcacf2ee74422d0d7563 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 20 Mar 2010 02:26:57 +0100 Subject: 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. --- src/common.c | 5 +---- src/common.h | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/common.c b/src/common.c index 32b64d49..b58d9bee 100644 --- a/src/common.c +++ b/src/common.c @@ -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; diff --git a/src/common.h b/src/common.h index d166f485..c43e46d7 100644 --- a/src/common.h +++ b/src/common.h @@ -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); -- cgit v1.2.3