diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2011-05-04 14:33:19 +0200 |
---|---|---|
committer | Johan Hedberg <jh@dell.(none)> | 2011-05-15 01:47:05 +0300 |
commit | 24c6dee3b307cbf9e99dfdb875895f410120ec41 (patch) | |
tree | 876401c003e0b55530ed50102c1fd615b0c60266 /audio | |
parent | f8937ef1557797ceb52519b68434f608a7b68690 (diff) | |
download | bluez-24c6dee3b307cbf9e99dfdb875895f410120ec41.tar.gz |
Remove redundant local copy of GSlist* from functions
Those functions already get copy of pointer to list so local copy is
not needed.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/a2dp.c | 5 | ||||
-rw-r--r-- | audio/avdtp.c | 18 | ||||
-rw-r--r-- | audio/control.c | 6 | ||||
-rw-r--r-- | audio/manager.c | 6 | ||||
-rw-r--r-- | audio/unix.c | 5 |
5 files changed, 14 insertions, 26 deletions
diff --git a/audio/a2dp.c b/audio/a2dp.c index 9cd72071..6f7a437f 100644 --- a/audio/a2dp.c +++ b/audio/a2dp.c @@ -1375,10 +1375,9 @@ static sdp_record_t *a2dp_record(uint8_t type, uint16_t avdtp_ver) static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) { - GSList *l; - for (l = list; l; l = l->next) { - struct a2dp_server *server = l->data; + for (; list; list = list->next) { + struct a2dp_server *server = list->data; if (bacmp(&server->src, src) == 0) return server; diff --git a/audio/avdtp.c b/audio/avdtp.c index c2aeeec7..f61e2f66 100644 --- a/audio/avdtp.c +++ b/audio/avdtp.c @@ -453,10 +453,8 @@ static void auth_cb(DBusError *derr, void *user_data); static struct avdtp_server *find_server(GSList *list, const bdaddr_t *src) { - GSList *l; - - for (l = list; l; l = l->next) { - struct avdtp_server *server = l->data; + for (; list; list = list->next) { + struct avdtp_server *server = list->data; if (bacmp(&server->src, src) == 0) return server; @@ -2217,10 +2215,8 @@ failed: static struct avdtp *find_session(GSList *list, const bdaddr_t *dst) { - GSList *l; - - for (l = list; l != NULL; l = g_slist_next(l)) { - struct avdtp *s = l->data; + for (; list != NULL; list = g_slist_next(list)) { + struct avdtp *s = list->data; if (bacmp(dst, &s->dst)) continue; @@ -3189,10 +3185,8 @@ gboolean avdtp_stream_has_capability(struct avdtp_stream *stream, gboolean avdtp_stream_has_capabilities(struct avdtp_stream *stream, GSList *caps) { - GSList *l; - - for (l = caps; l; l = g_slist_next(l)) { - struct avdtp_service_capability *cap = l->data; + for (; caps; caps = g_slist_next(caps)) { + struct avdtp_service_capability *cap = caps->data; if (!avdtp_stream_has_capability(stream, cap)) return FALSE; diff --git a/audio/control.c b/audio/control.c index d6890de8..17454b9a 100644 --- a/audio/control.c +++ b/audio/control.c @@ -910,10 +910,8 @@ int avrcp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) static struct avctp_server *find_server(GSList *list, const bdaddr_t *src) { - GSList *l; - - for (l = list; l; l = l->next) { - struct avctp_server *server = l->data; + for (; list; list = list->next) { + struct avctp_server *server = list->data; if (bacmp(&server->src, src) == 0) return server; diff --git a/audio/manager.c b/audio/manager.c index f9b460ef..727c0cc3 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -124,10 +124,8 @@ static struct enabled_interfaces enabled = { static struct audio_adapter *find_adapter(GSList *list, struct btd_adapter *btd_adapter) { - GSList *l; - - for (l = list; l; l = l->next) { - struct audio_adapter *adapter = l->data; + for (; list; list = list->next) { + struct audio_adapter *adapter = list->data; if (adapter->btd_adapter == btd_adapter) return adapter; diff --git a/audio/unix.c b/audio/unix.c index 37c772d6..b29f5f5a 100644 --- a/audio/unix.c +++ b/audio/unix.c @@ -629,7 +629,6 @@ static void a2dp_discovery_complete(struct avdtp *session, GSList *seps, char buf[BT_SUGGESTED_BUFFER_SIZE]; struct bt_get_capabilities_rsp *rsp = (void *) buf; struct a2dp_data *a2dp = &client->d.a2dp; - GSList *l; if (!g_slist_find(clients, client)) { DBG("Client disconnected during discovery"); @@ -649,8 +648,8 @@ static void a2dp_discovery_complete(struct avdtp *session, GSList *seps, ba2str(&client->dev->dst, rsp->destination); strncpy(rsp->object, client->dev->path, sizeof(rsp->object)); - for (l = seps; l; l = g_slist_next(l)) { - struct avdtp_remote_sep *rsep = l->data; + for (; seps; seps = g_slist_next(seps)) { + struct avdtp_remote_sep *rsep = seps->data; struct a2dp_sep *sep; struct avdtp_service_capability *cap; struct avdtp_stream *stream; |