diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index 9472194faa..a6bd223c36 100644
--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@@ -87,12 +87,11 @@ static int xattr(int fd,
   int err = 0;
   if(value) {
 #ifdef DEBUGBUILD
-    (void)fd;
     if(getenv("CURL_FAKE_XATTR")) {
       printf("%s => %s\n", attr, value);
+      return 0;
     }
-    return 0;
-#else
+#endif
 #ifdef HAVE_FSETXATTR_6
     err = fsetxattr(fd, attr, value, strlen(value), 0, 0);
 #elif defined(HAVE_FSETXATTR_5)
@@ -105,7 +104,6 @@ static int xattr(int fd,
          attribute */
       err = (rc < 0 ? -1 : 0);
     }
-#endif
 #endif
   }
   return err;