git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Print extended help when the user types an unknown command first.
[libguestfs.git]
/
daemon
/
proto.c
diff --git
a/daemon/proto.c
b/daemon/proto.c
index
e3ff9e9
..
0002d80
100644
(file)
--- a/
daemon/proto.c
+++ b/
daemon/proto.c
@@
-195,12
+195,11
@@
reply_with_error (const char *fs, ...)
}
void
}
void
-reply_with_perror
(
const char *fs, ...)
+reply_with_perror
_errno (int err,
const char *fs, ...)
{
char buf1[GUESTFS_ERROR_LEN];
char buf2[GUESTFS_ERROR_LEN];
va_list args;
{
char buf1[GUESTFS_ERROR_LEN];
char buf2[GUESTFS_ERROR_LEN];
va_list args;
- int err = errno;
va_start (args, fs);
vsnprintf (buf1, sizeof buf1, fs, args);
va_start (args, fs);
vsnprintf (buf1, sizeof buf1, fs, args);
@@
-290,7
+289,7
@@
reply (xdrproc_t xdrp, char *ret)
* we want to return an error message instead. (RHBZ#509597).
*/
if (!(*xdrp) (&xdr, ret)) {
* we want to return an error message instead. (RHBZ#509597).
*/
if (!(*xdrp) (&xdr, ret)) {
- reply_with_
perror ("guestfsd: failed to encode reply body\n
");
+ reply_with_
error ("guestfsd: failed to encode reply body\n(maybe the reply exceeds the maximum message size in the protocol?)
");
xdr_destroy (&xdr);
return;
}
xdr_destroy (&xdr);
return;
}