External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

interface: Use g_strdup_printf() instead of virAsprintf()

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2019-10-22 15:26:14 +02:00
parent 5858950a85
commit 9a2454bbc4
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interface/interface_backend_netcf.c
View File

@ -101,16 +101,13 @@ netcfStateInitialize(bool privileged,
driver->privileged = privileged; driver->privileged = privileged;
if (privileged) { if (privileged) {
if (virAsprintf(&driver->stateDir, driver->stateDir = g_strdup_printf("%s/libvirt/interface", RUNSTATEDIR);
"%s/libvirt/interface", RUNSTATEDIR) < 0)
goto error;
} else { } else {
g_autofree char *rundir = NULL; g_autofree char *rundir = NULL;
if (!(rundir = virGetUserRuntimeDirectory())) if (!(rundir = virGetUserRuntimeDirectory()))
goto error; goto error;
if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) driver->stateDir = g_strdup_printf("%s/interface/run", rundir);
goto error;
} }
if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) {

14
src/interface/interface_backend_udev.c
View File

@ -856,9 +856,7 @@ udevGetIfaceDefBridge(struct udev *udev,
} }
/* Members of the bridge */ /* Members of the bridge */
if (virAsprintf(&member_path, "%s/%s", member_path = g_strdup_printf("%s/%s", udev_device_get_syspath(dev), "brif");
udev_device_get_syspath(dev), "brif") < 0)
goto error;
/* Get each member of the bridge */ /* Get each member of the bridge */
member_count = scandir(member_path, &member_list, member_count = scandir(member_path, &member_list,
@ -920,8 +918,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED,
const char *dev_prefix = "\nDevice: "; const char *dev_prefix = "\nDevice: ";
int ret = -1; int ret = -1;
if (virAsprintf(&procpath, "/proc/net/vlan/%s", name) < 0) procpath = g_strdup_printf("/proc/net/vlan/%s", name);
goto cleanup;
if (virFileReadAll(procpath, BUFSIZ, &buf) < 0) if (virFileReadAll(procpath, BUFSIZ, &buf) < 0)
goto cleanup; goto cleanup;
@ -1164,16 +1161,13 @@ udevStateInitialize(bool privileged,
driver->lockFD = -1; driver->lockFD = -1;
if (privileged) { if (privileged) {
if (virAsprintf(&driver->stateDir, driver->stateDir = g_strdup_printf("%s/libvirt/interface", RUNSTATEDIR);
"%s/libvirt/interface", RUNSTATEDIR) < 0)
goto cleanup;
} else { } else {
g_autofree char *rundir = NULL; g_autofree char *rundir = NULL;
if (!(rundir = virGetUserRuntimeDirectory())) if (!(rundir = virGetUserRuntimeDirectory()))
goto cleanup; goto cleanup;
if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) driver->stateDir = g_strdup_printf("%s/interface/run", rundir);
goto cleanup;
} }
if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) {