From: Pekka Pessi <Pekka.Pessi@nokia.com>
Date: Thu, 26 Aug 2010 14:26:48 +0000 (+0300)
Subject: ofono: refactor modem_has_gprs()
X-Git-Tag: 0.61~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=076d63263da9b56521c6f9994e2d4c7809d3d6e2;p=platform%2Fupstream%2Fconnman.git

ofono: refactor modem_has_gprs()
---

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 092564c..ec85d9f 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -927,18 +927,19 @@ static struct modem_data *add_modem(const char *path)
 	return modem;
 }
 
-static gboolean modem_has_gprs(DBusMessageIter *array)
+static gboolean modem_has_interface(DBusMessageIter *array,
+					char const *interface)
 {
 	DBusMessageIter entry;
 
 	dbus_message_iter_recurse(array, &entry);
 
 	while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
-		const char *interface;
+		const char *element;
 
-		dbus_message_iter_get_basic(&entry, &interface);
+		dbus_message_iter_get_basic(&entry, &element);
 
-		if (g_strcmp0(OFONO_GPRS_INTERFACE, interface) == 0)
+		if (g_strcmp0(interface, element) == 0)
 			return TRUE;
 
 		dbus_message_iter_next(&entry);
@@ -947,6 +948,11 @@ static gboolean modem_has_gprs(DBusMessageIter *array)
 	return FALSE;
 }
 
+static gboolean modem_has_gprs(DBusMessageIter *array)
+{
+	return modem_has_interface(array, OFONO_GPRS_INTERFACE);
+}
+
 static void modem_properties_reply(DBusPendingCall *call, void *user_data)
 {
 	DBusMessage *reply;