X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=83c9672dda602d59f61faa2e684280864a908732;hb=7eda9e6fb2b1f6504167ab650886f5a336fc6919;hp=cbcab639621700413278c2b7eae495023ff69d04;hpb=fc266e5ab8c4f013d0e473029c5e0b4cd32cca92;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index cbcab63..83c9672 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -40,7 +40,7 @@ extern int xwrite (int sock, const void *buf, size_t len);
 extern int xread (int sock, void *buf, size_t len);
 
 extern int add_string (char ***argv, int *size, int *alloc, const char *str);
-extern int count_strings (char * const* const argv);
+extern int count_strings (char *const *argv);
 extern void sort_strings (char **argv, int len);
 extern void free_strings (char **argv);
 extern void free_stringslen (char **argv, int len);
@@ -48,9 +48,9 @@ extern void free_stringslen (char **argv, int len);
 extern int command (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandr (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandv (char **stdoutput, char **stderror,
-                     char * const* const argv);
+                     char *const *argv);
 extern int commandrv (char **stdoutput, char **stderror,
-                      char * const* const argv);
+                      char const* const *argv);
 
 extern char **split_lines (char *str);
 
@@ -91,7 +91,7 @@ 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);
+extern void main_loop (int sock) __attribute__((noreturn));
 
 /* ordinary daemon functions use these to indicate errors */
 extern void reply_with_error (const char *fs, ...)
@@ -116,7 +116,7 @@ extern void cancel_receive (void);
  * Note max write size if GUESTFS_MAX_CHUNK_SIZE.
  */
 extern int send_file_write (const void *buf, int len);
-extern void send_file_end (int cancel);
+extern int send_file_end (int cancel);
 
 /* only call this if there is a FileOut parameter */
 extern void reply (xdrproc_t xdrp, char *ret);