session: Rename session_parse_allowed_bearers() to parse_bearers()
authorDaniel Wagner <daniel.wagner@bmw-carit.de>
Wed, 31 Oct 2012 09:33:34 +0000 (10:33 +0100)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Mon, 5 Nov 2012 12:47:29 +0000 (14:47 +0200)
This function name was a source of confusion because in a later patch
we introduce connman_session_parse_allowed_bearers() which will
call parse_bearers(). With this change it should be more readable.

src/session.c

index c01ab4e..85ce909 100644 (file)
@@ -386,7 +386,7 @@ void connman_session_free_bearers(GSList *bearers)
        g_slist_free_full(bearers, cleanup_bearer);
 }
 
-static int session_parse_allowed_bearers(DBusMessageIter *iter, GSList **list)
+static int parse_bearers(DBusMessageIter *iter, GSList **list)
 {
        struct connman_session_bearer *bearer;
        DBusMessageIter array;
@@ -1452,8 +1452,7 @@ static DBusMessage *change_session(DBusConnection *conn,
        switch (dbus_message_iter_get_arg_type(&value)) {
        case DBUS_TYPE_ARRAY:
                if (g_str_equal(name, "AllowedBearers") == TRUE) {
-                       err = session_parse_allowed_bearers(&value,
-                                                       &allowed_bearers);
+                       err = parse_bearers(&value, &allowed_bearers);
                        if (err < 0)
                                return __connman_error_failed(msg, err);
 
@@ -1623,8 +1622,7 @@ int __connman_session_create(DBusMessage *msg)
                switch (dbus_message_iter_get_arg_type(&value)) {
                case DBUS_TYPE_ARRAY:
                        if (g_str_equal(key, "AllowedBearers") == TRUE) {
-                               err = session_parse_allowed_bearers(&value,
-                                                       &allowed_bearers);
+                               err = parse_bearers(&value, &allowed_bearers);
                                if (err < 0)
                                        goto err;