mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-nbd: Fix invalid usage of the first argument of errx

Browse Source 
errx takes the exit status of a process as the first
argument. Passing errno to it is wrong. Instead the
patch lets errx take EXIT_FAILURE.

Signed-off-by: Ryota Ozaki <ozaki.ryota@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Ryota Ozaki 2010-03-20 15:23:23 +09:00 committed by Aurelien Jarno
parent a16c174c51
commit b6353bea57
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qemu-nbd.c
View File

@ -114,7 +114,7 @@ static int find_partition(BlockDriverState *bs, int partition,
int ext_partnum = 4; int ext_partnum = 4;
if (bdrv_read(bs, 0, data, 1)) if (bdrv_read(bs, 0, data, 1))
errx(EINVAL, "error while reading"); errx(EXIT_FAILURE, "error while reading");
if (data[510] != 0x55 || data[511] != 0xaa) { if (data[510] != 0x55 || data[511] != 0xaa) {
errno = -EINVAL; errno = -EINVAL;
@ -133,7 +133,7 @@ static int find_partition(BlockDriverState *bs, int partition,
int j; int j;
if (bdrv_read(bs, mbr[i].start_sector_abs, data1, 1)) if (bdrv_read(bs, mbr[i].start_sector_abs, data1, 1))
errx(EINVAL, "error while reading"); errx(EXIT_FAILURE, "error while reading");
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
read_partition(&data1[446 + 16 * j], &ext[j]); read_partition(&data1[446 + 16 * j], &ext[j]);
@ -240,20 +240,20 @@ int main(int argc, char **argv)
case 'p': case 'p':
li = strtol(optarg, &end, 0); li = strtol(optarg, &end, 0);
if (*end) { if (*end) {
errx(EINVAL, "Invalid port `%s'", optarg); errx(EXIT_FAILURE, "Invalid port `%s'", optarg);
} }
if (li < 1 || li > 65535) { if (li < 1 || li > 65535) {
errx(EINVAL, "Port out of range `%s'", optarg); errx(EXIT_FAILURE, "Port out of range `%s'", optarg);
} }
port = (uint16_t)li; port = (uint16_t)li;
break; break;
case 'o': case 'o':
dev_offset = strtoll (optarg, &end, 0); dev_offset = strtoll (optarg, &end, 0);
if (*end) { if (*end) {
errx(EINVAL, "Invalid offset `%s'", optarg); errx(EXIT_FAILURE, "Invalid offset `%s'", optarg);
} }
if (dev_offset < 0) { if (dev_offset < 0) {
errx(EINVAL, "Offset must be positive `%s'", optarg); errx(EXIT_FAILURE, "Offset must be positive `%s'", optarg);
} }
break; break;
case 'r': case 'r':
@ -263,14 +263,14 @@ int main(int argc, char **argv)
case 'P': case 'P':
partition = strtol(optarg, &end, 0); partition = strtol(optarg, &end, 0);
if (*end) if (*end)
errx(EINVAL, "Invalid partition `%s'", optarg); errx(EXIT_FAILURE, "Invalid partition `%s'", optarg);
if (partition < 1 || partition > 8) if (partition < 1 || partition > 8)
errx(EINVAL, "Invalid partition %d", partition); errx(EXIT_FAILURE, "Invalid partition %d", partition);
break; break;
case 'k': case 'k':
socket = optarg; socket = optarg;
if (socket[0] != '/') if (socket[0] != '/')
errx(EINVAL, "socket path must be absolute\n"); errx(EXIT_FAILURE, "socket path must be absolute\n");
break; break;
case 'd': case 'd':
disconnect = true; disconnect = true;
@ -281,10 +281,10 @@ int main(int argc, char **argv)
case 'e': case 'e':
shared = strtol(optarg, &end, 0); shared = strtol(optarg, &end, 0);
if (*end) { if (*end) {
errx(EINVAL, "Invalid shared device number '%s'", optarg); errx(EXIT_FAILURE, "Invalid shared device number '%s'", optarg);
} }
if (shared < 1) { if (shared < 1) {
errx(EINVAL, "Shared device number must be greater than 0\n"); errx(EXIT_FAILURE, "Shared device number must be greater than 0\n");
} }
break; break;
case 't': case 't':
@ -302,13 +302,13 @@ int main(int argc, char **argv)
exit(0); exit(0);
break; break;
case '?': case '?':
errx(EINVAL, "Try `%s --help' for more information.", errx(EXIT_FAILURE, "Try `%s --help' for more information.",
argv[0]); argv[0]);
} }
} }
if ((argc - optind) != 1) { if ((argc - optind) != 1) {
errx(EINVAL, "Invalid number of argument.\n" errx(EXIT_FAILURE, "Invalid number of argument.\n"
"Try `%s --help' for more information.", "Try `%s --help' for more information.",
argv[0]); argv[0]);
} }
@ -316,7 +316,7 @@ int main(int argc, char **argv)
if (disconnect) { if (disconnect) {
fd = open(argv[optind], O_RDWR); fd = open(argv[optind], O_RDWR);
if (fd == -1) if (fd == -1)
errx(errno, "Cannot open %s", argv[optind]); errx(EXIT_FAILURE, "Cannot open %s", argv[optind]);
nbd_disconnect(fd); nbd_disconnect(fd);
@ -340,7 +340,7 @@ int main(int argc, char **argv)
if (partition != -1 && if (partition != -1 &&
find_partition(bs, partition, &dev_offset, &fd_size)) find_partition(bs, partition, &dev_offset, &fd_size))
errx(errno, "Could not find partition %d", partition); errx(EXIT_FAILURE, "Could not find partition %d", partition);
if (device) { if (device) {
pid_t pid; pid_t pid;
@ -349,7 +349,7 @@ int main(int argc, char **argv)
if (!verbose) { if (!verbose) {
/* detach client and server */ /* detach client and server */
if (daemon(0, 0) == -1) { if (daemon(0, 0) == -1) {
errx(errno, "Failed to daemonize"); errx(EXIT_FAILURE, "Failed to daemonize");
} }
} }
@ -429,7 +429,7 @@ int main(int argc, char **argv)
data = qemu_memalign(512, NBD_BUFFER_SIZE); data = qemu_memalign(512, NBD_BUFFER_SIZE);
if (data == NULL) if (data == NULL)
errx(ENOMEM, "Cannot allocate data buffer"); errx(EXIT_FAILURE, "Cannot allocate data buffer");
do { do {