aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/db/upnp/Discovery.cxx3
-rw-r--r--src/db/upnp/WorkQueue.hxx4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/db/upnp/Discovery.cxx b/src/db/upnp/Discovery.cxx
index 23705271d..9d2b8dbd0 100644
--- a/src/db/upnp/Discovery.cxx
+++ b/src/db/upnp/Discovery.cxx
@@ -109,8 +109,7 @@ discoExplorer(void *)
{
for (;;) {
DiscoveredTask *tsk = 0;
- size_t qsz;
- if (!discoveredQueue.take(&tsk, &qsz)) {
+ if (!discoveredQueue.take(&tsk)) {
discoveredQueue.workerExit();
return (void*)1;
}
diff --git a/src/db/upnp/WorkQueue.hxx b/src/db/upnp/WorkQueue.hxx
index c41b22094..432351250 100644
--- a/src/db/upnp/WorkQueue.hxx
+++ b/src/db/upnp/WorkQueue.hxx
@@ -241,7 +241,7 @@ public:
* Sleeps if there are not enough. Signal if we go to sleep on empty
* queue: client may be waiting for our going idle.
*/
- bool take(T* tp, size_t *szp = 0)
+ bool take(T* tp)
{
const ScopeLock protect(m_mutex);
@@ -267,8 +267,6 @@ public:
}
*tp = m_queue.front();
- if (szp)
- *szp = m_queue.size();
m_queue.pop();
if (m_clients_waiting > 0) {
// No reason to wake up more than one client thread