about summary refs log tree commit diff
path: root/support/blob_repeat.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-10-30 13:55:50 +0100
committerFlorian Weimer <fweimer@redhat.com>2018-10-30 13:55:50 +0100
commita91e9301c47bb688f4e496a19cfc68261ff18293 (patch)
tree1e74e1e7b72eddee8d68edbdad9ce75253fca594 /support/blob_repeat.c
parent07da99aad93c9364acb7efdab47c27ba698f6313 (diff)
downloadglibc-a91e9301c47bb688f4e496a19cfc68261ff18293.tar.gz
glibc-a91e9301c47bb688f4e496a19cfc68261ff18293.tar.xz
glibc-a91e9301c47bb688f4e496a19cfc68261ff18293.zip
support_blob_repeat: Call mkstemp directory for the backing file
This avoids a warning during post-test cleanup.
Diffstat (limited to 'support/blob_repeat.c')
-rw-r--r--support/blob_repeat.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/support/blob_repeat.c b/support/blob_repeat.c
index da4ca83043..16c1e448b9 100644
--- a/support/blob_repeat.c
+++ b/support/blob_repeat.c
@@ -23,8 +23,8 @@
 #include <string.h>
 #include <support/blob_repeat.h>
 #include <support/check.h>
+#include <support/test-driver.h>
 #include <support/support.h>
-#include <support/temp_file.h>
 #include <support/xunistd.h>
 #include <sys/mman.h>
 #include <unistd.h>
@@ -155,13 +155,17 @@ allocate_big (size_t total_size, const void *element, size_t element_size,
   if (target == MAP_FAILED)
     return (struct support_blob_repeat) { 0 };
 
-  /* Create the backing file for the repeated mapping.  */
+  /* Create the backing file for the repeated mapping.  Call mkstemp
+     directly to remove the resources backing the temporary file
+     immediately, once support_blob_repeat_free is called.  Using
+     create_temp_file would result in a warning during post-test
+     cleanup.  */
   int fd;
   {
-    char *temppath;
-    fd = create_temp_file ("support_blob_repeat-", &temppath);
+    char *temppath = xasprintf ("%s/support_blob_repeat-XXXXXX", test_dir);
+    fd = mkstemp (temppath);
     if (fd < 0)
-      FAIL_EXIT1 ("create_temp_file: %m");
+      FAIL_EXIT1 ("mkstemp (\"%s\"): %m", temppath);
     xunlink (temppath);
     free (temppath);
   }