X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fguestfsd.c;h=af554bf7c3814771bdf2984c534a25700f919590;hb=7eda9e6fb2b1f6504167ab650886f5a336fc6919;hp=fad49fb64afed997e18284820e6f4b3ff2158416;hpb=adf20c0c4d9f488d55254f54a79079b9cacbde8d;p=libguestfs.git

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index fad49fb..af554bf 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -273,9 +273,10 @@ sysroot_path (const char *path)
 }
 
 int
-xwrite (int sock, const void *buf, size_t len)
+xwrite (int sock, const void *v_buf, size_t len)
 {
   int r;
+  const char *buf = v_buf;
 
   while (len > 0) {
     r = write (sock, buf, len);
@@ -291,9 +292,10 @@ xwrite (int sock, const void *buf, size_t len)
 }
 
 int
-xread (int sock, void *buf, size_t len)
+xread (int sock, void *v_buf, size_t len)
 {
   int r;
+  char *buf = v_buf;
 
   while (len > 0) {
     r = read (sock, buf, len);
@@ -743,8 +745,6 @@ print_sysroot_shell_quote (FILE *stream,
                            const struct printf_info *info,
                            const void *const *args)
 {
-#define SAFE(c) (isalnum((c)) ||					\
-                 (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.')
   fputs (sysroot, stream);
   return sysroot_len + print_shell_quote (stream, info, args);
 }