[Libguestfs] [PATCH 2/2] proto: Remove another error message which hides earlier error.
Richard W.M. Jones
rjones at redhat.com
Tue Dec 10 08:58:41 UTC 2013
From: "Richard W.M. Jones" <rjones at redhat.com>
When receive_file_data calls guestfs___recv_from_daemon, and that
function returns -1, it adds the following error to the handle:
receive_file_data: parse error in reply callback
However this hides a more specific error message which was already
added by guestfs___recv_from_daemon.
---
src/proto.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/proto.c b/src/proto.c
index 1117368..fbe7e3b 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -830,10 +830,8 @@ receive_file_data (guestfs_h *g, void **buf_r)
guestfs_chunk chunk;
r = guestfs___recv_from_daemon (g, &len, &buf);
- if (r == -1) {
- error (g, _("receive_file_data: parse error in reply callback"));
+ if (r == -1)
return -1;
- }
if (len == GUESTFS_LAUNCH_FLAG || len == GUESTFS_CANCEL_FLAG) {
error (g, _("receive_file_data: unexpected flag received when reading file chunks"));
--
1.8.3.1
More information about the Libguestfs
mailing list