The signature of consume() threw me off. Good design says that if
you are going to have paired parameters (buf and bufsize), you
generally want them adjacent, not separated by an unrelated parameter
(len). Move len to be first, adjusting all callers.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
nbd-server.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/nbd-server.c b/nbd-server.c
index d0c6fa6..c93a9d8 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -359,12 +359,12 @@ static void socket_read(CLIENT* client, void *buf, size_t
len) {
/**
* Consume data from a socket that we don't want
*
- * @param f a file descriptor
- * @param buf a buffer
+ * @param c the client to read from
* @param len the number of bytes to consume
+ * @param buf a buffer
* @param bufsiz the size of the buffer
**/
-static inline void consume(CLIENT* c, void * buf, size_t len, size_t bufsiz) {
+static inline void consume(CLIENT* c, size_t len, void * buf, size_t bufsiz) {
size_t curlen;
while (len>0) {
curlen = (len>bufsiz)?bufsiz:len;
@@ -1853,14 +1853,14 @@ int mainloop(CLIENT *client) {
(client->server->flags & F_AUTOREADONLY)) {
DEBUG("[WRITE to READONLY!]");
ERROR(client, reply, EPERM);
- consume(client, buf, len-currlen,
BUFSIZE);
+ consume(client, len-currlen, buf,
BUFSIZE);
continue;
}
if (expwrite(request.from, buf, currlen, client,
request.type & NBD_CMD_FLAG_FUA)) {
DEBUG("Write failed: %m" );
ERROR(client, reply, errno);
- consume(client, buf, len-currlen,
BUFSIZE);
+ consume(client, len-currlen, buf,
BUFSIZE);
continue;
}
len -= currlen;
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Nbd-general mailing list
Nbd-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nbd-general
