X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=88d03065de3fcde6394b78d72e9e9d0589fe6e7e;hb=4b09663f01224c27f00376011022526437680078;hp=612a6a662508156efdee78876d97491df9b2b7f7;hpb=940ef864d02584720e3ef4f55d680fa3432ba508;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 612a6a6..88d0306 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -119,8 +119,9 @@ extern void main_loop (int sock) __attribute__((noreturn));
 /* ordinary daemon functions use these to indicate errors */
 extern void reply_with_error (const char *fs, ...)
   __attribute__((format (printf,1,2)));
-extern void reply_with_perror (const char *fs, ...)
-  __attribute__((format (printf,1,2)));
+extern void reply_with_perror_errno (int err, const char *fs, ...)
+  __attribute__((format (printf,2,3)));
+#define reply_with_perror(...) reply_with_perror_errno(errno, __VA_ARGS__)
 
 /* daemon functions that receive files (FileIn) should call
  * receive_file for each FileIn parameter.
@@ -130,7 +131,7 @@ extern int receive_file (receive_cb cb, void *opaque);
 
 /* daemon functions that receive files (FileIn) can call this
  * to cancel incoming transfers (eg. if there is a local error),
- * but they MUST then call reply_with_error or reply_with_perror.
+ * but they MUST then call reply_with_*.
  */
 extern void cancel_receive (void);
 
@@ -196,7 +197,7 @@ extern void reply (xdrproc_t xdrp, char *ret);
  */
 #define REQUIRE_ROOT_OR_RESOLVE_DEVICE(path,fail_stmt)			\
   do {									\
-    if (STREQLEN ((path), "/dev/", 5))				\
+    if (STREQLEN ((path), "/dev/", 5))                                  \
       RESOLVE_DEVICE ((path), fail_stmt);				\
     else {								\
       NEED_ROOT (fail_stmt);						\