From 9d8aa928b8981caafa395bc219327156fb747580 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakivskyy Date: Tue, 10 Apr 2012 15:17:27 +0300 Subject: call-forwarding: Refactor cf_find_unconditional() --- src/call-forwarding.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'src/call-forwarding.c') diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 2a7bff05..0bf406af 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -197,26 +197,12 @@ static void sim_cphs_cff_update_cb(int ok, void *data) ofono_info("Failed to update EFcphs-cff"); } -static struct ofono_call_forwarding_condition *cf_find_unconditional( +static inline struct ofono_call_forwarding_condition *cf_find_unconditional( struct ofono_call_forwarding *cf) { - GSList *l = cf->cf_conditions[CALL_FORWARDING_TYPE_UNCONDITIONAL]; - struct ofono_call_forwarding_condition *cond; - - /* - * For now we only support Voice, although Fax & all Data - * basic services are applicable as well. - */ - for (; l; l = l->next) { - cond = l->data; - - if (cond->cls > BEARER_CLASS_VOICE) - continue; - - return cond; - } - - return NULL; + return cf_cond_find( + cf->cf_conditions[CALL_FORWARDING_TYPE_UNCONDITIONAL], + BEARER_CLASS_VOICE); } static void sim_set_cf_indicator(struct ofono_call_forwarding *cf) -- cgit v1.2.3