X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=001c7038d04b8f924decea316df199fbb52d9a51;hb=bb98bbb91c74cca47b5e1f79fd54f4024572fd22;hp=331fc0dfbba8884c5f362c46520f7c7ed9aaf961;hpb=e2870fb94cbd22affecdd16e8f75f75e78d1c18b;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 331fc0d..001c703 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -41,8 +41,11 @@ extern void free_strings (char **argv);
 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);
+extern int commandrv (char **stdoutput, char **stderror,
+		      char * const* const argv);
 
 extern int shell_quote (char *out, int len, const char *in);
 
@@ -92,14 +95,6 @@ extern void send_file_end (int cancel);
 /* only call this if there is a FileOut parameter */
 extern void reply (xdrproc_t xdrp, char *ret);
 
-/* Append to existing string.  If existing string is NULL then
- * this creates a new string.  This uses an "interesting" variation
- * of asprintf.
- */
-
-#define catprintf(strp,fs,...) \
-  asprintf ((strp), "%s" fs, *(strp) ? *(strp) : "", __VA_ARGS__)
-
 /* Helper for functions that need a root filesystem mounted.
  * NB. Cannot be used for FileIn functions.
  */