Release 2.9.23

[nbd.git] / nbd-client.c

diff --git a/nbd-client.c b/nbd-client.c
index 2456c59..6ad9d55 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -3,6 +3,7 @@
  *
  * Copyright 1997,1998 Pavel Machek, distribute under GPL
  *  <pavel@atrey.karlin.mff.cuni.cz>
+ * Copyright (c) 2002 - 2011 Wouter Verhelst <w@uter.be>
  *
  * Version 1.0 - 64bit issues should be fixed, now
  * Version 1.1 - added bs (blocksize) option (Alexey Guzeev, aga@permonline.ru)
@@ -218,11 +219,10 @@ void setsizes(int nbd, u64 size64, int blocksize, u32 flags) {
        if (size64>>12 > (uint64_t)~0UL)
                err("Device too large.\n");
        else {
-               int er;
                if (ioctl(nbd, NBD_SET_BLKSIZE, 4096UL) < 0)
                        err("Ioctl/1.1a failed: %m\n");
                size = (unsigned long)(size64>>12);
-               if ((er = ioctl(nbd, NBD_SET_SIZE_BLOCKS, size)) < 0)
+               if (ioctl(nbd, NBD_SET_SIZE_BLOCKS, size) < 0)
                        err("Ioctl/1.1b failed: %m\n");
                if (ioctl(nbd, NBD_SET_BLKSIZE, (unsigned long)blocksize) < 0)
                        err("Ioctl/1.1c failed: %m\n");
@@ -435,7 +435,6 @@ int main(int argc, char *argv[]) {
        nbd = open(nbddev, O_RDWR);
        if (nbd < 0)
          err("Cannot open NBD: %m\nPlease ensure the 'nbd' module is loaded.");
-       ++argv; --argc; /* skip device */
 
        sock = opennet(hostname, port, sdp);