X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=bb1ebb3ad9c4425f0f4431774b0e6409a0a4e888;hb=1ea1e536346f59fa63fdd33639ffc297282bfc37;hp=6ce46b9cbd37644c55e9f9e5e822de439e8b1b80;hpb=f02acc3d307f210d418a0177f374d02a4f8ccb5a;p=libguestfs.git diff --git a/daemon/daemon.h b/daemon/daemon.h index 6ce46b9..bb1ebb3 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -116,11 +116,15 @@ extern int sync_disks (void); /*-- in proto.c --*/ extern void main_loop (int sock) __attribute__((noreturn)); -/* ordinary daemon functions use these to indicate errors */ +/* ordinary daemon functions use these to indicate errors + * NB: you don't need to prefix the string with the current command, + * it is added automatically by the client-side RPC stubs. + */ 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 +134,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);