[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/19] nbd/server: get rid of ssize_t
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 02/19] nbd/server: get rid of ssize_t |
Date: |
Tue, 30 May 2017 17:30:35 +0300 |
Now read_sync and friends return int, so get rid of ssize_t.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
nbd/server.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 26096f14e1..03880fd501 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -625,11 +625,11 @@ fail:
return rc;
}
-static ssize_t nbd_receive_request(QIOChannel *ioc, NBDRequest *request)
+static int nbd_receive_request(QIOChannel *ioc, NBDRequest *request)
{
uint8_t buf[NBD_REQUEST_SIZE];
uint32_t magic;
- ssize_t ret;
+ int ret;
ret = read_sync(ioc, buf, sizeof(buf), NULL);
if (ret < 0) {
@@ -663,7 +663,7 @@ static ssize_t nbd_receive_request(QIOChannel *ioc,
NBDRequest *request)
return 0;
}
-static ssize_t nbd_send_reply(QIOChannel *ioc, NBDReply *reply)
+static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply)
{
uint8_t buf[NBD_REPLY_SIZE];
@@ -969,11 +969,10 @@ void nbd_export_close_all(void)
}
}
-static ssize_t nbd_co_send_reply(NBDRequestData *req, NBDReply *reply,
- int len)
+static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
{
NBDClient *client = req->client;
- ssize_t rc, ret;
+ int rc, ret;
g_assert(qemu_in_coroutine());
qemu_co_mutex_lock(&client->send_lock);
@@ -1003,11 +1002,10 @@ static ssize_t nbd_co_send_reply(NBDRequestData *req,
NBDReply *reply,
* and any other negative value to report an error to the client
* (although the caller may still need to disconnect after reporting
* the error). */
-static ssize_t nbd_co_receive_request(NBDRequestData *req,
- NBDRequest *request)
+static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
{
NBDClient *client = req->client;
- ssize_t rc;
+ int rc;
g_assert(qemu_in_coroutine());
assert(client->recv_coroutine == qemu_coroutine_self());
@@ -1105,7 +1103,7 @@ static coroutine_fn void nbd_trip(void *opaque)
NBDRequestData *req;
NBDRequest request = { 0 }; /* GCC thinks it can be used uninitialized
*/
NBDReply reply;
- ssize_t ret;
+ int ret;
int flags;
TRACE("Reading request.");
--
2.11.1
- [Qemu-devel] [PATCH 10/19] nbd/server: refactor nbd_trip, (continued)
- [Qemu-devel] [PATCH 10/19] nbd/server: refactor nbd_trip, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 13/19] nbd/server: return original error codes, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 09/19] nbd/server: rename rc to ret, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 05/19] nbd/server: refactor nbd_co_receive_request, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 12/19] nbd/common: nbd_wr_syncv handle QIO_CHANNEL_ERR_EPIPE, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 18/19] nbd/client: refactor TRACE of NBD_MAGIC, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 14/19] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 02/19] nbd/server: get rid of ssize_t,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 17/19] nbd/common: nbd_tls_handshake: use error_reportf_err instead of TRACE, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 06/19] nbd/server: remove NBDClientNewData, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 01/19] nbd/server: get rid of nbd_negotiate_read and friends, Vladimir Sementsov-Ogievskiy, 2017/05/30