lib: Replace virBuildPath() with g_build_filename()

Our virBuildPath() constructs a path from given arguments.
Exactly like g_build_filename(), except the latter is more
generic as it uses backslashes on Windows. Therefore, replace the
former with the latter.

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

diff --git a/docs/kbase/internals/command.rst b/docs/kbase/internals/command.rst
index 738fb5930a22cfbf4eef72f9655ca637cc01af70..064a7872e642a8dc366314c9448416c2d6b1a51d 100644 (file)
--- a/docs/kbase/internals/command.rst
+++ b/docs/kbase/internals/command.rst
@@ -444,7 +444,7 @@ src/util/hooks.c
      g_autofree char *path = NULL;
      g_autoptr(virCommand) cmd = NULL;
 
-     virBuildPath(&path, LIBVIRT_HOOK_DIR, drvstr);
+     path = g_build_filename(LIBVIRT_HOOK_DIR, drvstr, NULL);
 
      cmd = virCommandNew(path);
 

diff --git a/src/util/virfcp.c b/src/util/virfcp.c
index bb62fa90254dc86bfb2e35256494fb5e9293aaa6..052a6c99e1a375d41f6a6586ab5e3625809d2e13 100644 (file)
--- a/src/util/virfcp.c
+++ b/src/util/virfcp.c
@@ -38,7 +38,7 @@ virFCIsCapableRport(const char *rport)
 {
     g_autofree char *path = NULL;
 
-    virBuildPath(&path, SYSFS_FC_RPORT_PATH, rport);
+    path = g_build_filename(SYSFS_FC_RPORT_PATH, rport, NULL);
 
     return virFileExists(path);
 }

diff --git a/src/util/virhook.c b/src/util/virhook.c
index 50e178723f39deed798f5e96e4e3eb707675140c..d012bb1825765ef9c8e62872548e87391ab0cc42 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -153,7 +153,7 @@ virHookCheck(int no, const char *driver)
         return -1;
     }
 
-    virBuildPath(&path, LIBVIRT_HOOK_DIR, driver);
+    path = g_build_filename(LIBVIRT_HOOK_DIR, driver, NULL);
 
     if (!virFileExists(path)) {
         VIR_DEBUG("No hook script %s", path);
@@ -398,7 +398,7 @@ virHookCall(int driver,
     if (extra == NULL)
         extra = "-";
 
-    virBuildPath(&path, LIBVIRT_HOOK_DIR, drvstr);
+    path = g_build_filename(LIBVIRT_HOOK_DIR, drvstr, NULL);
 
     script_ret = 1;
 

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 08b82708b14ea7809df86d64d15596073b8f4473..baacde4c14f783e97a44e5eaba29a5d703a2e5b0 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -2396,7 +2396,7 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path,
 
     *pf = NULL;
 
-    virBuildPath(&device_link, vf_sysfs_path, "physfn");
+    device_link = g_build_filename(vf_sysfs_path, "physfn", NULL);
 
     if ((*pf = virPCIGetDeviceAddressFromSysfsLink(device_link))) {
         VIR_DEBUG("PF for VF device '%s': " VIR_PCI_DEVICE_ADDRESS_FMT,
@@ -2580,7 +2580,7 @@ virPCIGetNetName(const char *device_link_sysfs_path,
         return -1;
     }
 
-    virBuildPath(&pcidev_sysfs_net_path, device_link_sysfs_path, "net");
+    pcidev_sysfs_net_path = g_build_filename(device_link_sysfs_path, "net", NULL);
 
     if (virDirOpenQuiet(&dir, pcidev_sysfs_net_path) < 0) {
         /* this *isn't* an error - caller needs to check for netname == NULL */