update generator to emit each RESOLVE_DEVICE call

[libguestfs.git] / daemon / link.c

diff --git a/daemon/link.c b/daemon/link.c
index 57e3538..bf616ed 100644 (file)
--- a/daemon/link.c
+++ b/daemon/link.c
@@ -35,7 +35,7 @@ do_readlink (char *path)
   char link[PATH_MAX];
 
   NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
+  ABS_PATH (path, return NULL);
 
   CHROOT_IN;
   r = readlink (path, link, sizeof link);
@@ -63,7 +63,7 @@ _link (const char *flag, int symbolic, const char *target, const char *linkname)
   char *buf_target;
 
   NEED_ROOT (-1);
-  ABS_PATH (linkname, -1);
+  ABS_PATH (linkname, return -1);
   /* but target does not need to be absolute */
 
   /* Prefix linkname with sysroot. */
@@ -90,19 +90,19 @@ _link (const char *flag, int symbolic, const char *target, const char *linkname)
 
   if (flag)
     r = command (NULL, &err,
-                "ln", flag, "--", /* target could begin with '-' */
-                buf_target ? : target, buf_linkname, NULL);
+                 "ln", flag, "--", /* target could begin with '-' */
+                 buf_target ? : target, buf_linkname, NULL);
   else
     r = command (NULL, &err,
-                "ln", "--",
-                buf_target ? : target, buf_linkname, NULL);
+                 "ln", "--",
+                 buf_target ? : target, buf_linkname, NULL);
   free (buf_linkname);
   free (buf_target);
   if (r == -1) {
     reply_with_error ("ln%s%s: %s: %s: %s",
-                     flag ? " " : "",
-                     flag ? : "",
-                     target, linkname, err);
+                      flag ? " " : "",
+                      flag ? : "",
+                      target, linkname, err);
     free (err);
     return -1;
   }