diff options
| author | Szymon Janc <szymon.janc@gmail.com> | 2014-01-20 12:08:33 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-01-20 15:19:25 +0200 |
| commit | af00880e63bde0d9433f7bedd2532fb67bc7f7a2 (patch) | |
| tree | 2dc6efdc28b15e71634c87fddba90136e71d560f /src/sdp-client.c | |
| parent | c8260c5acb07379b7de9754b65ec677ae96907d4 (diff) | |
| download | bluez-af00880e63bde0d9433f7bedd2532fb67bc7f7a2.tar.gz | |
core: Opencode get_sdp_session in sdp-client
This is only used once and provides no benefit compared to opencoding.
Diffstat (limited to 'src/sdp-client.c')
| -rw-r--r-- | src/sdp-client.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/sdp-client.c b/src/sdp-client.c index 51f304825..059962605 100644 --- a/src/sdp-client.c +++ b/src/sdp-client.c @@ -86,17 +86,6 @@ static sdp_session_t *get_cached_sdp_session(const bdaddr_t *src, const bdaddr_t return NULL; } -static sdp_session_t *get_sdp_session(const bdaddr_t *src, const bdaddr_t *dst) -{ - sdp_session_t *session; - - session = get_cached_sdp_session(src, dst); - if (session) - return session; - - return sdp_connect(src, dst, SDP_NON_BLOCKING); -} - static void cache_sdp_session(bdaddr_t *src, bdaddr_t *dst, sdp_session_t *session) { @@ -285,7 +274,10 @@ static int create_search_context(struct search_context **ctxt, if (!ctxt) return -EINVAL; - s = get_sdp_session(src, dst); + s = get_cached_sdp_session(src, dst); + if (!s) + s = sdp_connect(src, dst, SDP_NON_BLOCKING); + if (!s) return -errno; |