[PATCHv4 05/13] call-forwarding: Streamline cf_find_timeout() logic

[Oleg Zhurakivskyy]

---
 src/call-forwarding.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index 5e68bba..424b111 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -104,16 +104,11 @@ static struct ofono_call_forwarding_condition 
*cf_cond_find(GSList *l, int cls)
        return NULL;
 }
 
-static int cf_find_timeout(GSList *cf_list, int cls)
+static int cf_cond_find_timeout(GSList *l, int cls)
 {
-       struct ofono_call_forwarding_condition *c;
+       struct ofono_call_forwarding_condition *cond = cf_cond_find(l, cls);
 
-       c = cf_cond_find(cf_list, cls);
-
-       if (c == NULL)
-               return DEFAULT_NO_REPLY_TIMEOUT;
-
-       return c->time;
+       return cond ? cond->time : DEFAULT_NO_REPLY_TIMEOUT;
 }
 
 static void cf_cond_list_print(GSList *l)
@@ -813,7 +808,7 @@ static DBusMessage *cf_set_property(DBusConnection *conn, 
DBusMessage *msg,
                if (number[0] != '\0')
                        string_to_phone_number(number, &ph);
 
-               timeout = cf_find_timeout(cf->cf_conditions[type], cls);
+               timeout = cf_cond_find_timeout(cf->cf_conditions[type], cls);
 
                return set_property_request(cf, msg, type, cls, &ph,
                                                timeout);
-- 
1.7.5.4

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono