Use g_mkdtemp instead of mkdtemp

Prefer the GLib version to the one from gnulib.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1192b4447dff75ccef2f45bb99626d1ae6d7ca9f..246934c634325e79c0f3544099d4d967c17dd9e4 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8447,7 +8447,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc)
 
     template = g_strdup_printf("%s/qmp-XXXXXX", proc->libDir);
 
-    if (!(proc->uniqDir = mkdtemp(template))) {
+    if (!(proc->uniqDir = g_mkdtemp(template))) {
         virReportSystemError(errno,
                              _("Failed to create unique directory with "
                                "template '%s' for probing QEMU"),

diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index f4d38d5a20e2f45f97939b0450274f539344e51e..03f5520fa66255bece9d82da30d1d2d7bb3f2642 100644 (file)
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -319,7 +319,7 @@ mymain(void)
     char scratchdir[] = SCRATCHDIRTEMPLATE;
     int ret = 0;
 
-    if (!mkdtemp(scratchdir)) {
+    if (!g_mkdtemp(scratchdir)) {
         virFilePrintf(stderr, "Cannot create fdstreamdir");
         abort();
     }

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 000cfcfcadf3f4e9e5e8e651e3c51ab2a5f28d3a..a914a8a8b5f28a361a65d2c6974c3ae6500aeadc 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -596,7 +596,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
index d5a4fb126824e8e765eefa0348ae1d38efa6ddf6..52cd9f9f26db2518e648f0f201971dd0c1143e40 100644 (file)
--- a/tests/qemumemlocktest.c
+++ b/tests/qemumemlocktest.c
@@ -62,7 +62,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index d7ecdb2ef92c13395b3651e060498122321ef702..617a2997d11c6a68aebf5776cebe78551aded490 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1045,7 +1045,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt,
 
     tmpdir_template = g_strdup("/tmp/libvirt_XXXXXX");
 
-    if (!(test->tmpdir = mkdtemp(tmpdir_template))) {
+    if (!(test->tmpdir = g_mkdtemp(tmpdir_template))) {
         virReportSystemError(errno, "%s",
                              "Failed to create temporary directory");
         goto error;

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f839d77e8e8d6fd7947476928b4d53f824e3053b..9bb186ed95edee61c532aa7d7d24793ff4ffc50a 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -609,7 +609,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c160988a1ba0b00f2dc29aac672c6575ecf3330d..757e0a33e151ac053a031cd716f589b0a9613491 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -142,7 +142,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index b35ec6980a67926f2d3660a1ccc84715c80414af..e8193836ff32d0864ad6862688189a615a33faab 100644 (file)
--- a/tests/scsihosttest.c
+++ b/tests/scsihosttest.c
@@ -250,7 +250,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         goto cleanup;
     }

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 6fe385e545ab7c7bf40f1bd0984abe83a4d8c59d..5a7011478b89c4f7b5631ba6bbe1eab2dfce391d 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -709,14 +709,14 @@ int qemuTestDriverInit(virQEMUDriver *driver)
     driver->config->libDir = g_strdup("/tmp/lib");
     driver->config->channelTargetDir = g_strdup("/tmp/channel");
 
-    if (!mkdtemp(statedir)) {
+    if (!g_mkdtemp(statedir)) {
         virFilePrintf(stderr, "Cannot create fake stateDir");
         goto error;
     }
 
     driver->config->stateDir = g_strdup(statedir);
 
-    if (!mkdtemp(configdir)) {
+    if (!g_mkdtemp(configdir)) {
         virFilePrintf(stderr, "Cannot create fake configDir");
         goto error;
     }

diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index e1770426d7f0fef91d03f5da0211dea2a7dd436c..c952676c25462a1f14f50d83c004fcfe5839f3fb 100644 (file)
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -989,7 +989,7 @@ initFakeFS(const char *mode,
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
index 1f3f73043392fcfe90e79e00459959dd08d6ecbc..ed8e7e8fc12fe5c9bc73afd5199c9fbe8f9b835e 100644 (file)
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -502,7 +502,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         fprintf(stderr, "Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 4e9f201e4577b17cdc3769abf3c8ced1ddf620d7..3a5959b27edf7c59206d77faa508e40192b12bed 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -191,7 +191,7 @@ testSocketAccept(const void *opaque)
 
     if (!data) {
         virNetSocketPtr usock;
-        tmpdir = mkdtemp(template);
+        tmpdir = g_mkdtemp(template);
         if (tmpdir == NULL) {
             VIR_WARN("Failed to create temporary directory");
             goto cleanup;
@@ -315,7 +315,7 @@ static int testSocketUNIXAddrs(const void *data G_GNUC_UNUSED)
     char *tmpdir;
     char template[] = "/tmp/libvirt_XXXXXX";
 
-    tmpdir = mkdtemp(template);
+    tmpdir = g_mkdtemp(template);
     if (tmpdir == NULL) {
         VIR_WARN("Failed to create temporary directory");
         goto cleanup;

diff --git a/tests/virpcitest.c b/tests/virpcitest.c
index d6dbe8c1ef220e18168ee0009fdaddff4bfa9678..21dd5382321189c490c912b7b7ca037cab4a9653 100644 (file)
--- a/tests/virpcitest.c
+++ b/tests/virpcitest.c
@@ -330,7 +330,7 @@ mymain(void)
 
     fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
 
-    if (!mkdtemp(fakerootdir)) {
+    if (!g_mkdtemp(fakerootdir)) {
         VIR_TEST_DEBUG("Cannot create fakerootdir");
         abort();
     }

diff --git a/tests/virscsitest.c b/tests/virscsitest.c
index 4d40f2bb822dd39803c868308eb7c21fb0362af9..d5a0da475380a7ac68e4b9dd4cdaa7504a422743 100644 (file)
--- a/tests/virscsitest.c
+++ b/tests/virscsitest.c
@@ -194,7 +194,7 @@ mymain(void)
 
     virscsi_prefix = g_strdup_printf("%s" VIR_SCSI_DATA, abs_srcdir);
 
-    tmpdir = mkdtemp(template);
+    tmpdir = g_mkdtemp(template);
 
     if (tmpdir == NULL) {
         VIR_WARN("Failed to create temporary directory");