From 9b37eefdb71572105f2e8402ac11e6068faeabb9 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakivskyy Date: Tue, 10 Apr 2012 15:17:22 +0300 Subject: [PATCH] call-forwarding: Refactor cf_condition_compare() --- src/call-forwarding.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 8b6659a..2b91250 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -86,18 +86,12 @@ static void get_query_next_cf_cond(struct ofono_call_forwarding *cf); static void set_query_next_cf_cond(struct ofono_call_forwarding *cf); static void ss_set_query_next_cf_cond(struct ofono_call_forwarding *cf); -static gint cf_condition_compare(gconstpointer a, gconstpointer b) +static gint cf_cond_compare(gconstpointer a, gconstpointer b) { const struct ofono_call_forwarding_condition *ca = a; const struct ofono_call_forwarding_condition *cb = b; - if (ca->cls < cb->cls) - return -1; - - if (ca->cls > cb->cls) - return 1; - - return 0; + return ca->cls - cb->cls; } static gint cf_condition_find_with_cls(gconstpointer a, gconstpointer b) @@ -175,8 +169,7 @@ static GSList *cf_cond_list_create(int total, sizeof(struct ofono_call_forwarding_condition)); cond->cls = j; - l = g_slist_insert_sorted(l, cond, - cf_condition_compare); + l = g_slist_insert_sorted(l, cond, cf_cond_compare); } } -- 2.7.4