summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-06-08 21:53:07 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-06-09 10:53:12 +0100
commit9160eec4fbf12643d8d5fa13465066822b2fed92 (patch)
treef74b87ec94332de280273fe02d124a577a8d3795
parentbfc02f78f36d88543f8435e450e28c986b667a94 (diff)
downloadlibguestfs-9160eec4fbf12643d8d5fa13465066822b2fed92.tar.gz
libguestfs-9160eec4fbf12643d8d5fa13465066822b2fed92.tar.xz
libguestfs-9160eec4fbf12643d8d5fa13465066822b2fed92.zip
Coverity: Remove unreachable code.
-rw-r--r--daemon/base64.c2
-rw-r--r--daemon/debug.c4
-rw-r--r--daemon/tar.c2
-rw-r--r--daemon/upload.c4
4 files changed, 0 insertions, 12 deletions
diff --git a/daemon/base64.c b/daemon/base64.c
index f55e1f51..8aca5b71 100644
--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -86,8 +86,6 @@ do_base64_in (const char *file)
}
if (pclose (fp) != 0) {
- if (r == -1) /* if r == 0, file transfer ended already */
- cancel_receive ();
reply_with_error ("base64 subcommand failed on file: %s", file);
return -1;
}
diff --git a/daemon/debug.c b/daemon/debug.c
index cd3e8a5f..0ade2a41 100644
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -549,10 +549,6 @@ do_debug_upload (const char *filename, int mode)
}
if (close (fd) == -1) {
- int err = errno;
- if (r == -1) /* if r == 0, file transfer ended already */
- cancel_receive ();
- errno = err;
reply_with_perror ("close: %s", filename);
return -1;
}
diff --git a/daemon/tar.c b/daemon/tar.c
index 39fce8c9..74d7b056 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -127,8 +127,6 @@ do_tXz_in (const char *dir, const char *filter)
}
if (pclose (fp) != 0) {
- if (r == -1) /* if r == 0, file transfer ended already */
- r = cancel_receive ();
char *errstr = read_error_file ();
reply_with_error ("tar subcommand failed on directory: %s: %s",
dir, errstr);
diff --git a/daemon/upload.c b/daemon/upload.c
index 2c429694..a1a37aee 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -103,10 +103,6 @@ upload (const char *filename, int flags, int64_t offset)
}
if (close (data.fd) == -1) {
- err = errno;
- if (r == -1) /* if r == 0, file transfer ended already */
- r = cancel_receive ();
- errno = err;
reply_with_perror ("close: %s", filename);
return -1;
}