X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fdir.c;h=20cbd243150df349db590c39ce16b97eccec52aa;hb=8601bbda56cdb2b8491b6e2054596ec9599c38f1;hp=a8f066fd149f5215b2ead5f14fc73a4b8ad508c8;hpb=78029b529ad98769685d607230b70f71832d5906;p=libguestfs.git

diff --git a/daemon/dir.c b/daemon/dir.c
index a8f066f..20cbd24 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -35,7 +35,7 @@ do_rmdir (char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = rmdir (path);
@@ -60,7 +60,7 @@ do_rm_rf (char *path)
   char *buf, *err;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   if (strcmp (path, "/") == 0) {
     reply_with_error ("rm -rf: cannot remove root directory");
@@ -94,7 +94,7 @@ do_mkdir (char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
@@ -123,8 +123,8 @@ recursive_mkdir (const char *path)
       r = lstat (path, &buf);
       if (r == -1) return -1;
       if (!S_ISDIR (buf.st_mode)) {
-	errno = ENOTDIR;
-	return -1;
+        errno = ENOTDIR;
+        return -1;
       }
       return 0;			/* OK - directory exists here already. */
     }
@@ -160,7 +160,7 @@ do_mkdir_p (char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = recursive_mkdir (path);
@@ -181,7 +181,7 @@ do_is_dir (char *path)
   struct stat buf;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = lstat (path, &buf);
@@ -205,7 +205,7 @@ do_mkdtemp (char *template)
   char *r;
 
   NEED_ROOT (NULL);
-  ABS_PATH (template, NULL);
+  ABS_PATH (template, return NULL);
 
   CHROOT_IN;
   r = mkdtemp (template);