Commit 14686cd1a81a0172a9cd9eb23bbd3f0df3b10e05
2017-08-16T20:24:27
test/interactive-wayland: avoid unused function warning due to configuration test/interactive-wayland.c:95:1: warning: ‘set_cloexec_or_close’ defined but not used [-Wunused-function] Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/test/interactive-wayland.c b/test/interactive-wayland.c
index 6fd57b8..95775b4 100644
--- a/test/interactive-wayland.c
+++ b/test/interactive-wayland.c
@@ -71,6 +71,16 @@ struct interactive_seat {
static bool terminate;
+#ifdef HAVE_MKOSTEMP
+static int
+create_tmpfile_cloexec(char *tmpname)
+{
+ int fd = mkostemp(tmpname, O_CLOEXEC);
+ if (fd >= 0)
+ unlink(tmpname);
+ return fd;
+}
+#else
/* The following utility functions are taken from Weston's
* shared/os-compatibility.c. */
static int
@@ -104,22 +114,14 @@ set_cloexec_or_close(int fd)
static int
create_tmpfile_cloexec(char *tmpname)
{
- int fd;
-
-#ifdef HAVE_MKOSTEMP
- fd = mkostemp(tmpname, O_CLOEXEC);
- if (fd >= 0)
- unlink(tmpname);
-#else
- fd = mkstemp(tmpname);
+ int fd = mkstemp(tmpname);
if (fd >= 0) {
fd = set_cloexec_or_close(fd);
unlink(tmpname);
}
-#endif
-
return fd;
}
+#endif
/*
* Create a new, unique, anonymous file of the given size, and