On Tue, 2019-09-10 at 14:41 +0200, Max Reitz wrote:
> This does not really change anything, but it makes the code a bit easier
> to follow once we use @socket as the opaque pointer for
> aio_set_fd_handler().
>
> Cc: qemu-sta...@nongnu.org
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> block/curl.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/block/curl.c b/block/curl.c
> index 92dc2f630e..95d7b77dc0 100644
> --- a/block/curl.c
> +++ b/block/curl.c
> @@ -172,10 +172,6 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd,
> int action,
>
> QLIST_FOREACH(socket, &state->sockets, next) {
> if (socket->fd == fd) {
> - if (action == CURL_POLL_REMOVE) {
> - QLIST_REMOVE(socket, next);
> - g_free(socket);
> - }
> break;
> }
> }
> @@ -185,7 +181,6 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int
> action,
> socket->state = state;
> QLIST_INSERT_HEAD(&state->sockets, socket, next);
> }
> - socket = NULL;
>
> trace_curl_sock_cb(action, (int)fd);
> switch (action) {
> @@ -207,6 +202,11 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd,
> int action,
> break;
> }
>
> + if (action == CURL_POLL_REMOVE) {
> + QLIST_REMOVE(socket, next);
> + g_free(socket);
> + }
> +
> return 0;
> }
>
Reviewed-by: Maxim Levitsky <mlevi...@redhat.com>
Best regards,
Maxim Levitsky
