On 03/13/2012 08:46 AM, Oleg Zhurakivskyy wrote: > Re-use cf_find() instead. > --- > src/call-forwarding.c | 28 ++++++---------------------- > 1 files changed, 6 insertions(+), 22 deletions(-) > > diff --git a/src/call-forwarding.c b/src/call-forwarding.c > index 5a2ab28..b1a1a72 100644 > --- a/src/call-forwarding.c > +++ b/src/call-forwarding.c > @@ -44,6 +44,12 @@ > > #define CFC(_x) ((struct ofono_call_forwarding_condition *)(_x)) > > +#define cf_find_unconditional(_cf) \ > +({ \ > + cf_find((_cf)->cf_conditions[CALL_FORWARDING_TYPE_UNCONDITIONAL],\ > + BEARER_CLASS_VOICE); \ > +}) > + Actually I'd prefer if we made this an inline function rather than a macro. A bit easier to read that way. Regards, -Denis