fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 22:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

agents: remove request_cancel()

Browse source 
Turns out this function is useless, because it's only called when the
agent has dropped off the bus or when the whole request is being
freed.  If the agent has dropped off the bus then there's no point
in asking it to cancel the request because there's nothing to ask.
So we can collapse request_cancel() into request_free().
This commit is contained in:
Dan Williams 2013-06-26 14:11:33 -05:00
parent ab84a86678
commit 724b9c045b
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/settings/nm-agent-manager.c
View file

@ -121,7 +121,7 @@ remove_agent (NMAgentManager *self, const char *owner)
if (!agent)
return FALSE;
nm_log_dbg (LOGD_AGENTS, "(%s) agent unregistered",
nm_log_dbg (LOGD_AGENTS, "(%s) agent unregistered or disappeared",
nm_secret_agent_get_description (agent));
/* Remove this agent to any in-progress secrets requests */
@ -466,15 +466,6 @@ request_new (gsize struct_size,
return req;
}
static void
request_cancel (Request *req)
{
if (req->cancel_callback)
req->cancel_callback (req);
req->current = NULL;
req->current_call_id = NULL;
}
static void
request_free (Request *req)
{
@ -484,7 +475,8 @@ request_free (Request *req)
if (req->idle_id)
g_source_remove (req->idle_id);
request_cancel (req);
if (req->cancel_callback)
req->cancel_callback (req);
g_free (req->detail);
g_free (req->verb);
@ -610,6 +602,9 @@ request_next_agent (Request *req)
req->next_callback (req);
} else {
req->current_call_id = NULL;
req->current = NULL;
/* No more secret agents are available to fulfill this secrets request */
error = g_error_new_literal (NM_AGENT_MANAGER_ERROR,
NM_AGENT_MANAGER_ERROR_NO_SECRETS,
@ -628,10 +623,6 @@ request_remove_agent (Request *req, NMSecretAgent *agent)
req->pending = g_slist_remove (req->pending, agent);
if (agent == req->current) {
/* If this agent is being asked right now, cancel the request and send it
* to the next agent.
*/
request_cancel (req);
nm_log_dbg (LOGD_AGENTS, "(%s) current agent removed from secrets request %p/%s",
nm_secret_agent_get_description (agent), req, req->detail);
request_next_agent (req);