generator.ml: new type, "Pathname"

[libguestfs.git] / daemon / dir.c

diff --git a/daemon/dir.c b/daemon/dir.c
index 5945862..ec072dd 100644 (file)
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -34,8 +34,8 @@ do_rmdir (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = rmdir (path);
@@ -59,8 +59,8 @@ do_rm_rf (char *path)
   int r;
   char *buf, *err;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   if (strcmp (path, "/") == 0) {
     reply_with_error ("rm -rf: cannot remove root directory");
@@ -93,8 +93,8 @@ do_mkdir (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
@@ -159,8 +159,8 @@ do_mkdir_p (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = recursive_mkdir (path);
@@ -180,8 +180,8 @@ do_is_dir (char *path)
   int r;
   struct stat buf;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = lstat (path, &buf);
@@ -204,8 +204,8 @@ do_mkdtemp (char *template)
 {
   char *r;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (template, NULL);
+  NEED_ROOT (return NULL);
+  ABS_PATH (template, return NULL);
 
   CHROOT_IN;
   r = mkdtemp (template);