mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
virTPMCreateCancelPath: Refactor value returning
Automatically free 'path' inside the loop which fills it and return the values directly. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
ad81aa8ad0
commit
d42be77208
@ -59,7 +59,6 @@ VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
|
|||||||
char *
|
char *
|
||||||
virTPMCreateCancelPath(const char *devpath)
|
virTPMCreateCancelPath(const char *devpath)
|
||||||
{
|
{
|
||||||
char *path = NULL;
|
|
||||||
const char *dev;
|
const char *dev;
|
||||||
const char *prefix[] = {"misc/", "tpm/"};
|
const char *prefix[] = {"misc/", "tpm/"};
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -77,18 +76,14 @@ virTPMCreateCancelPath(const char *devpath)
|
|||||||
|
|
||||||
dev++;
|
dev++;
|
||||||
for (i = 0; i < G_N_ELEMENTS(prefix); i++) {
|
for (i = 0; i < G_N_ELEMENTS(prefix); i++) {
|
||||||
path = g_strdup_printf("/sys/class/%s%s/device/cancel", prefix[i],
|
g_autofree char *path = g_strdup_printf("/sys/class/%s%s/device/cancel",
|
||||||
dev);
|
prefix[i], dev);
|
||||||
|
|
||||||
if (virFileExists(path))
|
if (virFileExists(path))
|
||||||
break;
|
return g_steal_pointer(&path);
|
||||||
|
|
||||||
VIR_FREE(path);
|
|
||||||
}
|
}
|
||||||
if (!path)
|
|
||||||
path = g_strdup("/dev/null");
|
|
||||||
|
|
||||||
return path;
|
return g_strdup("/dev/null");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user