[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/16] curl: Keep *socket until the end of curl_sock_
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 07/16] curl: Keep *socket until the end of curl_sock_cb() |
Date: |
Mon, 16 Sep 2019 16:22:37 +0200 |
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: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Maxim Levitsky <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
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;
}
--
2.21.0
- [Qemu-block] [PULL 00/16] Block patches, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 01/16] block: Use QEMU_IS_ALIGNED, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 02/16] block: Remove unused masks, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 03/16] tests/qemu-iotests/check: Replace "tests" with "iotests" in final status text, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 04/16] tests/Makefile: Do not print the name of the check-block.sh shell script, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 06/16] curl: Keep pointer to the CURLState in CURLSocket, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 05/16] tests/qemu-iotests: Fix qemu-io related output in 026.out.nocache, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 07/16] curl: Keep *socket until the end of curl_sock_cb(),
Max Reitz <=
- [Qemu-block] [PULL 08/16] curl: Check completion in curl_multi_do(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 09/16] curl: Pass CURLSocket to curl_multi_do(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 10/16] curl: Report only ready sockets, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 11/16] curl: Handle success in multi_check_completion, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 12/16] curl: Check curl_multi_add_handle()'s return code, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 13/16] blockjob: update nodes head while removing all bdrv, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 14/16] block/qcow2: Fix corruption introduced by commit 8ac0f15f335, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 15/16] block/qcow2: refactor encryption code, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 16/16] qemu-iotests: Add test for bz #1745922, Max Reitz, 2019/09/16
- Re: [Qemu-block] [Qemu-devel] [PULL 00/16] Block patches, no-reply, 2019/09/16