ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/9pfs: Use g_autofree and g_autoptr where possible 

It is recommended to use g_autofree or g_autoptr as it reduces
the odds of introducing memory leaks in future changes.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20220201151508.190035-3-groug@kaod.org>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
This commit is contained in:
Greg Kurz 2022-02-01 16:15:08 +01:00 committed by Christian Schoenebeck
parent ba6112e40c
commit 494fbbd3ed
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/qtest/libqos/virtio-9p.c
View File

@ -41,7 +41,7 @@ void virtio_9p_create_local_test_dir(void)
{ {
g_assert(local_test_path == NULL); g_assert(local_test_path == NULL);
struct stat st; struct stat st;
char *pwd = g_get_current_dir(); g_autofree char *pwd = g_get_current_dir();
/* /*
* template gets cached into local_test_path and freed in * template gets cached into local_test_path and freed in
* virtio_9p_remove_local_test_dir(). * virtio_9p_remove_local_test_dir().
@ -52,7 +52,6 @@ void virtio_9p_create_local_test_dir(void)
if (!local_test_path) { if (!local_test_path) {
g_test_message("mkdtemp('%s') failed: %s", template, strerror(errno)); g_test_message("mkdtemp('%s') failed: %s", template, strerror(errno));
} }
g_free(pwd);
g_assert(local_test_path != NULL); g_assert(local_test_path != NULL);
@ -65,12 +64,11 @@ void virtio_9p_create_local_test_dir(void)
void virtio_9p_remove_local_test_dir(void) void virtio_9p_remove_local_test_dir(void)
{ {
g_assert(local_test_path != NULL); g_assert(local_test_path != NULL);
char *cmd = g_strdup_printf("rm -fr '%s'\n", local_test_path); g_autofree char *cmd = g_strdup_printf("rm -fr '%s'\n", local_test_path);
int res = system(cmd); int res = system(cmd);
if (res < 0) { if (res < 0) {
/* ignore error, dummy check to prevent compiler error */ /* ignore error, dummy check to prevent compiler error */
} }
g_free(cmd);
g_free(local_test_path); g_free(local_test_path);
local_test_path = NULL; local_test_path = NULL;
} }
@ -216,8 +214,8 @@ static void *virtio_9p_pci_create(void *pci_bus, QGuestAllocator *t_alloc,
static void regex_replace(GString *haystack, const char *pattern, static void regex_replace(GString *haystack, const char *pattern,
const char *replace_fmt, ...) const char *replace_fmt, ...)
{ {
GRegex *regex; g_autoptr(GRegex) regex = NULL;
char *replace, *s; g_autofree char *replace = NULL, *s = NULL;
va_list argp; va_list argp;
va_start(argp, replace_fmt); va_start(argp, replace_fmt);
@ -227,9 +225,6 @@ static void regex_replace(GString *haystack, const char *pattern,
regex = g_regex_new(pattern, 0, 0, NULL); regex = g_regex_new(pattern, 0, 0, NULL);
s = g_regex_replace(regex, haystack->str, -1, 0, replace, 0, NULL); s = g_regex_replace(regex, haystack->str, -1, 0, replace, 0, NULL);
g_string_assign(haystack, s); g_string_assign(haystack, s);
g_free(s);
g_regex_unref(regex);
g_free(replace);
} }
void virtio_9p_assign_local_driver(GString *cmd_line, const char *args) void virtio_9p_assign_local_driver(GString *cmd_line, const char *args)