From 0bf62525dd76931ef9a8e20ec87bf02840a686ef Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 13 Dec 2008 21:17:53 +0100 Subject: [PATCH] Remove the off policy option --- include/element.h | 5 ++--- src/element.c | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/include/element.h b/include/element.h index 466f46b..aede0d9 100644 --- a/include/element.h +++ b/include/element.h @@ -46,10 +46,9 @@ enum connman_element_state { enum connman_element_policy { CONNMAN_ELEMENT_POLICY_UNKNOWN = 0, - CONNMAN_ELEMENT_POLICY_OFF = 1, + CONNMAN_ELEMENT_POLICY_IGNORE = 1, CONNMAN_ELEMENT_POLICY_AUTO = 2, - CONNMAN_ELEMENT_POLICY_IGNORE = 3, - CONNMAN_ELEMENT_POLICY_ASK = 4, + CONNMAN_ELEMENT_POLICY_ASK = 3, }; enum connman_element_type { diff --git a/src/element.c b/src/element.c index ea49ec9..3c329b8 100644 --- a/src/element.c +++ b/src/element.c @@ -148,12 +148,10 @@ const char *__connman_element_policy2string(enum connman_element_policy policy) switch (policy) { case CONNMAN_ELEMENT_POLICY_UNKNOWN: return "unknown"; - case CONNMAN_ELEMENT_POLICY_OFF: - return "off"; - case CONNMAN_ELEMENT_POLICY_AUTO: - return "auto"; case CONNMAN_ELEMENT_POLICY_IGNORE: return "ignore"; + case CONNMAN_ELEMENT_POLICY_AUTO: + return "auto"; case CONNMAN_ELEMENT_POLICY_ASK: return "ask"; } @@ -163,9 +161,7 @@ const char *__connman_element_policy2string(enum connman_element_policy policy) enum connman_element_policy __connman_element_string2policy(const char *policy) { - if (strcasecmp(policy, "off") == 0) - return CONNMAN_ELEMENT_POLICY_OFF; - else if (strcasecmp(policy, "ignore") == 0) + if (strcasecmp(policy, "ignore") == 0) return CONNMAN_ELEMENT_POLICY_IGNORE; else if (strcasecmp(policy, "auto") == 0) return CONNMAN_ELEMENT_POLICY_AUTO; -- 2.7.4