Merge commit 'meins/master'

[paraslash.git] / fd.c

diff --git a/fd.c b/fd.c
index 8fc1abad19057bd724f26a25dca2ddb3ba5003ee..c675aaffd4b99083d3ab0e26445574c2b87ad51b 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -285,9 +285,10 @@ int para_opendir(const char *dirname, DIR **dir, int *cwd)
        if (*dir)
                return 1;
        ret = -ERRNO_TO_PARA_ERROR(errno);
        if (*dir)
                return 1;
        ret = -ERRNO_TO_PARA_ERROR(errno);

-/* Ignore return value of fchdir() and close(). We're busted anyway. */
-       if (cwd)
-               fchdir(*cwd);
+       /* Ignore return value of fchdir() and close(). We're busted anyway. */
+       if (cwd) {
+               int __a_unused ret2 = fchdir(*cwd); /* STFU, gcc */
+       }

 close_cwd:
        if (cwd)
                close(*cwd);
 close_cwd:
        if (cwd)
                close(*cwd);