motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions

Browse source 
Changed the allocations of some local variables to GLib's allocation
functions, such as g_try_malloc0(), and annotated those variables
as g_autofree. Subsequently, I was able to remove the calls to free().

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210420154643.58439-7-ma.mandourr@gmail.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Mahmoud Mandour 2021-04-20 17:46:41 +02:00 • committed by Dr. David Alan Gilbert
parent 31dfd22d7c
commit c9a276f57c
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tools/virtiofsd/passthrough_ll.c
View file

@ -1653,7 +1653,7 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
struct lo_data *lo = lo_data(req); struct lo_data *lo = lo_data(req);
struct lo_dirp *d = NULL; struct lo_dirp *d = NULL;
struct lo_inode *dinode; struct lo_inode *dinode;
char *buf = NULL; g_autofree char *buf = NULL;
char *p; char *p;
size_t rem = size; size_t rem = size;
int err = EBADF; int err = EBADF;
@ -1669,7 +1669,7 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
} }
err = ENOMEM; err = ENOMEM;
buf = calloc(1, size); buf = g_try_malloc0(size);
if (!buf) { if (!buf) {
goto error; goto error;
} }
@ -1755,7 +1755,6 @@ error:
} else { } else {
fuse_reply_buf(req, buf, size - rem); fuse_reply_buf(req, buf, size - rem);
} }
free(buf);
} }
static void lo_readdir(fuse_req_t req, fuse_ino_t ino, size_t size, static void lo_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
@ -2732,7 +2731,7 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_name,
size_t size) size_t size)
{ {
struct lo_data *lo = lo_data(req); struct lo_data *lo = lo_data(req);
char *value = NULL; g_autofree char *value = NULL;
char procname[64]; char procname[64];
const char *name; const char *name;
char *mapped_name; char *mapped_name;
@ -2773,7 +2772,7 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_name,
ino, name, size); ino, name, size);
if (size) { if (size) {
value = malloc(size); value = g_try_malloc(size);
if (!value) { if (!value) {
goto out_err; goto out_err;
} }
@ -2812,8 +2811,6 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_name,
fuse_reply_xattr(req, ret); fuse_reply_xattr(req, ret);
} }
out_free: out_free:
free(value);
if (fd >= 0) { if (fd >= 0) {
close(fd); close(fd);
} }
@ -2832,7 +2829,7 @@ out:
static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)
{ {
struct lo_data *lo = lo_data(req); struct lo_data *lo = lo_data(req);
char *value = NULL; g_autofree char *value = NULL;
char procname[64]; char procname[64];
struct lo_inode *inode; struct lo_inode *inode;
ssize_t ret; ssize_t ret;
@ -2854,7 +2851,7 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)
size); size);
if (size) { if (size) {
value = malloc(size); value = g_try_malloc(size);
if (!value) { if (!value) {
goto out_err; goto out_err;
} }
@ -2939,8 +2936,6 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)
fuse_reply_xattr(req, ret); fuse_reply_xattr(req, ret);
} }
out_free: out_free:
free(value);
if (fd >= 0) { if (fd >= 0) {
close(fd); close(fd);
} }