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

scan: Use a cast instead of an extra function

This commit is contained in:
Denis Kenzior 2018-07-11 16:20:29 -05:00
parent c33deb7a0a
commit dfe74ea8ff
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scan.c
View File

@ -108,18 +108,11 @@ static bool scan_request_match(const void *a, const void *b)
return sr->id == id; return sr->id == id;
} }
static void scan_cmd_free(void *data)
{
struct l_genl_msg *cmd = data;
l_genl_msg_unref(cmd);
}
static void scan_request_free(void *data) static void scan_request_free(void *data)
{ {
struct scan_request *sr = data; struct scan_request *sr = data;
l_queue_destroy(sr->cmds, scan_cmd_free); l_queue_destroy(sr->cmds, (l_queue_destroy_func_t) l_genl_msg_unref);
l_free(sr); l_free(sr);
} }
@ -398,7 +391,7 @@ static bool scan_request_send_first_cmd(struct scan_context *sc,
if (sc->start_cmd_id) if (sc->start_cmd_id)
return true; return true;
scan_cmd_free(cmd); l_genl_msg_unref(cmd);
error: error:
if (sr->trigger) if (sr->trigger)
sr->trigger(-EIO, sr->userdata); sr->trigger(-EIO, sr->userdata);
@ -1170,7 +1163,7 @@ static bool scan_send_next_cmd(struct scan_context *sc)
if (sc->start_cmd_id) if (sc->start_cmd_id)
return true; return true;
scan_cmd_free(cmd); l_genl_msg_unref(cmd);
if (sr->trigger) if (sr->trigger)
sr->trigger(-EIO, sr->userdata); sr->trigger(-EIO, sr->userdata);