Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

agent: Fix formatting

This commit is contained in:
Tim Kourt 2017-06-08 11:39:38 -07:00 committed by Denis Kenzior
parent 7bd22770ed
commit 31d60b5cf2
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/agent.c
View File

@ -73,10 +73,10 @@ static void send_request(struct agent *agent, const char *request)
agent->path); agent->path);
message = l_dbus_message_new_method_call(dbus_get_bus(), message = l_dbus_message_new_method_call(dbus_get_bus(),
agent->owner, agent->owner,
agent->path, agent->path,
IWD_AGENT_INTERFACE, IWD_AGENT_INTERFACE,
request); request);
l_dbus_message_set_arguments(message, ""); l_dbus_message_set_arguments(message, "");
@ -110,10 +110,10 @@ static void send_cancel_request(void *user_data, int reason)
agent->owner, agent->path); agent->owner, agent->path);
message = l_dbus_message_new_method_call(dbus_get_bus(), message = l_dbus_message_new_method_call(dbus_get_bus(),
agent->owner, agent->owner,
agent->path, agent->path,
IWD_AGENT_INTERFACE, IWD_AGENT_INTERFACE,
"Cancel"); "Cancel");
l_dbus_message_set_arguments(message, "s", reasonstr); l_dbus_message_set_arguments(message, "s", reasonstr);
@ -128,7 +128,7 @@ static void agent_request_free(void *user_data)
if (request->trigger) if (request->trigger)
dbus_pending_reply(&request->trigger, dbus_pending_reply(&request->trigger,
dbus_error_aborted(request->trigger)); dbus_error_aborted(request->trigger));
l_free(request); l_free(request);
} }
@ -241,9 +241,9 @@ static void agent_send_next_request(struct agent *agent)
l_debug("send request to %s %s", agent->owner, agent->path); l_debug("send request to %s %s", agent->owner, agent->path);
agent->pending_id = l_dbus_send_with_reply(dbus_get_bus(), agent->pending_id = l_dbus_send_with_reply(dbus_get_bus(),
pending->message, pending->message,
agent_receive_reply, agent_receive_reply,
agent, NULL); agent, NULL);
pending->message = NULL; pending->message = NULL;
@ -251,9 +251,10 @@ static void agent_send_next_request(struct agent *agent)
} }
static unsigned int agent_queue_request(struct agent *agent, static unsigned int agent_queue_request(struct agent *agent,
struct l_dbus_message *message, int timeout, struct l_dbus_message *message,
void *callback, struct l_dbus_message *trigger, int timeout, void *callback,
void *user_data) struct l_dbus_message *trigger,
void *user_data)
{ {
struct agent_request *request; struct agent_request *request;
@ -334,18 +335,16 @@ unsigned int agent_request_passphrase(const char *path,
l_debug("agent %p owner %s path %s", agent, agent->owner, agent->path); l_debug("agent %p owner %s path %s", agent, agent->owner, agent->path);
message = l_dbus_message_new_method_call(dbus_get_bus(), message = l_dbus_message_new_method_call(dbus_get_bus(),
agent->owner, agent->owner,
agent->path, agent->path,
IWD_AGENT_INTERFACE, IWD_AGENT_INTERFACE,
"RequestPassphrase"); "RequestPassphrase");
l_dbus_message_set_arguments(message, "o", path); l_dbus_message_set_arguments(message, "o", path);
return agent_queue_request(agent, message, return agent_queue_request(agent, message,
agent_timeout_input_request(), agent_timeout_input_request(),
callback, callback, trigger, user_data);
trigger,
user_data);
} }
static bool find_request(const void *a, const void *b) static bool find_request(const void *a, const void *b)
@ -396,7 +395,7 @@ static void agent_disconnect(struct l_dbus *dbus, void *user_data)
} }
static struct agent *agent_create(struct l_dbus *dbus, const char *name, static struct agent *agent_create(struct l_dbus *dbus, const char *name,
const char *path) const char *path)
{ {
struct agent *agent; struct agent *agent;
@ -406,8 +405,8 @@ static struct agent *agent_create(struct l_dbus *dbus, const char *name,
agent->path = l_strdup(path); agent->path = l_strdup(path);
agent->requests = l_queue_new(); agent->requests = l_queue_new();
agent->disconnect_watch = l_dbus_add_disconnect_watch(dbus, name, agent->disconnect_watch = l_dbus_add_disconnect_watch(dbus, name,
agent_disconnect, agent_disconnect,
agent, NULL); agent, NULL);
return agent; return agent;
} }