X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=88d03065de3fcde6394b78d72e9e9d0589fe6e7e;hb=09d988e8f1cfa42ef9a5abe5c9c151962aa1d2cc;hp=6872bd7530da3baccd035f74b85327702ebeff21;hpb=fdbc5aa711dde73eb448fbe13165c00a44272d00;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 6872bd7..88d0306 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -102,9 +102,6 @@ extern guestfs_int_lvm_pv_list *parse_command_line_pvs (void);
 extern guestfs_int_lvm_vg_list *parse_command_line_vgs (void);
 extern guestfs_int_lvm_lv_list *parse_command_line_lvs (void);
 
-/*-- in proto.c --*/
-extern void main_loop (int sock) __attribute__((noreturn));
-
 /*-- in optgroups.c (auto-generated) --*/
 struct optgroup {
   const char *group;            /* Name of the optional group. */
@@ -116,11 +113,15 @@ extern struct optgroup optgroups[];
 /* Use this as a replacement for sync(2). */
 extern int sync_disks (void);
 
+/*-- in proto.c --*/
+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);						\