X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=ea307015dc922a629779eac55fb8585d0934a84b;hb=refs%2Ftags%2F1.2.9;hp=88d03065de3fcde6394b78d72e9e9d0589fe6e7e;hpb=983e7a23456f413394a254f3aa4dbee271a30c47;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 88d0306..ea30701 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -43,7 +43,7 @@ extern int xread (int sock, void *buf, size_t len)
   __attribute__((__warn_unused_result__));
 
 extern int add_string (char ***argv, int *size, int *alloc, const char *str);
-extern int count_strings (char *const *argv);
+extern size_t 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);
@@ -66,8 +66,12 @@ extern int commandrvf (char **stdoutput, char **stderror, int flags,
 
 extern char **split_lines (char *str);
 
+extern void trim (char *str);
+
 extern int device_name_translation (char *device, const char *func);
 
+extern int prog_exists (const char *prog);
+
 extern void udev_settle (void);
 
 /* This just stops gcc from giving a warning about our custom
@@ -116,7 +120,10 @@ 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_errno (int err, const char *fs, ...)
@@ -126,7 +133,7 @@ extern void reply_with_perror_errno (int err, const char *fs, ...)
 /* daemon functions that receive files (FileIn) should call
  * receive_file for each FileIn parameter.
  */
-typedef int (*receive_cb) (void *opaque, const void *buf, int len);
+typedef int (*receive_cb) (void *opaque, const void *buf, size_t len);
 extern int receive_file (receive_cb cb, void *opaque);
 
 /* daemon functions that receive files (FileIn) can call this