提交 0d36f228 编写于 作者: M Michal Privoznik

virCondDestroy: Lose attribute RETURN_CHECK

We are wrapping it in ignore_value() anyway.
上级 4ca6f508
......@@ -636,7 +636,7 @@ virNWFilterSnoopReqFree(virNWFilterSnoopReqPtr req)
virNWFilterHashTableFree(req->vars);
virMutexDestroy(&req->lock);
ignore_value(virCondDestroy(&req->threadStatusCond));
virCondDestroy(&req->threadStatusCond);
VIR_FREE(req);
}
......
......@@ -158,7 +158,7 @@ static void qemuAgentDispose(void *obj)
VIR_DEBUG("mon=%p", mon);
if (mon->cb && mon->cb->destroy)
(mon->cb->destroy)(mon, mon->vm);
ignore_value(virCondDestroy(&mon->notify));
virCondDestroy(&mon->notify);
VIR_FREE(mon->buffer);
}
......
......@@ -133,7 +133,7 @@ qemuDomainObjInitJob(qemuDomainObjPrivatePtr priv)
return -1;
if (virCondInit(&priv->job.asyncCond) < 0) {
ignore_value(virCondDestroy(&priv->job.cond));
virCondDestroy(&priv->job.cond);
return -1;
}
......@@ -194,8 +194,8 @@ qemuDomainObjTransferJob(virDomainObjPtr obj)
static void
qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv)
{
ignore_value(virCondDestroy(&priv->job.cond));
ignore_value(virCondDestroy(&priv->job.asyncCond));
virCondDestroy(&priv->job.cond);
virCondDestroy(&priv->job.asyncCond);
}
static bool
......
......@@ -236,8 +236,7 @@ static void qemuMonitorDispose(void *obj)
VIR_DEBUG("mon=%p", mon);
if (mon->cb && mon->cb->destroy)
(mon->cb->destroy)(mon, mon->vm);
if (virCondDestroy(&mon->notify) < 0)
{}
virCondDestroy(&mon->notify);
VIR_FREE(mon->buffer);
}
......
......@@ -1382,7 +1382,7 @@ static bool virNetClientIOEventLoopRemoveDone(virNetClientCallPtr call,
VIR_DEBUG("Removing completed call %p", call);
if (call->expectReply)
VIR_WARN("Got a call expecting a reply but without a waiting thread");
ignore_value(virCondDestroy(&call->cond));
virCondDestroy(&call->cond);
VIR_FREE(call->msg);
VIR_FREE(call);
}
......@@ -1409,7 +1409,7 @@ virNetClientIOEventLoopRemoveAll(virNetClientCallPtr call,
return false;
VIR_DEBUG("Removing call %p", call);
ignore_value(virCondDestroy(&call->cond));
virCondDestroy(&call->cond);
VIR_FREE(call->msg);
VIR_FREE(call);
return true;
......@@ -1972,7 +1972,7 @@ static int virNetClientSendInternal(virNetClientPtr client,
if (ret == 1)
return 1;
ignore_value(virCondDestroy(&call->cond));
virCondDestroy(&call->cond);
VIR_FREE(call);
return ret;
}
......
......@@ -87,7 +87,7 @@ void virMutexUnlock(virMutexPtr m);
int virCondInit(virCondPtr c) ATTRIBUTE_RETURN_CHECK;
int virCondDestroy(virCondPtr c) ATTRIBUTE_RETURN_CHECK;
int virCondDestroy(virCondPtr c);
/* virCondWait, virCondWaitUntil:
* These functions can return without the associated predicate
......
......@@ -271,11 +271,11 @@ void virThreadPoolFree(virThreadPoolPtr pool)
VIR_FREE(pool->workers);
virMutexUnlock(&pool->mutex);
virMutexDestroy(&pool->mutex);
ignore_value(virCondDestroy(&pool->quit_cond));
ignore_value(virCondDestroy(&pool->cond));
virCondDestroy(&pool->quit_cond);
virCondDestroy(&pool->cond);
if (priority) {
VIR_FREE(pool->prioWorkers);
ignore_value(virCondDestroy(&pool->prioCond));
virCondDestroy(&pool->prioCond);
}
VIR_FREE(pool);
}
......
......@@ -407,7 +407,7 @@ int vshRunConsole(virDomainPtr dom,
if (con->st)
virStreamFree(con->st);
virMutexDestroy(&con->lock);
ignore_value(virCondDestroy(&con->cond));
virCondDestroy(&con->cond);
VIR_FREE(con);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册