[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations to GLi
From: |
Mahmoud Mandour |
Subject: |
[PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions |
Date: |
Fri, 19 Mar 2021 15:25:26 +0200 |
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>
---
tools/virtiofsd/passthrough_ll.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index d049013428..4263b383f0 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -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_dirp *d = NULL;
struct lo_inode *dinode;
- char *buf = NULL;
+ g_autofree char *buf = NULL;
char *p;
size_t rem = size;
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;
- buf = calloc(1, size);
+ buf = g_try_malloc0(size);
if (!buf) {
goto error;
}
@@ -1755,7 +1755,6 @@ error:
} else {
fuse_reply_buf(req, buf, size - rem);
}
- free(buf);
}
static void lo_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
@@ -2726,7 +2725,7 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino,
const char *in_name,
size_t size)
{
struct lo_data *lo = lo_data(req);
- char *value = NULL;
+ g_autofree char *value = NULL;
char procname[64];
const char *name;
char *mapped_name;
@@ -2767,7 +2766,7 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino,
const char *in_name,
ino, name, size);
if (size) {
- value = malloc(size);
+ value = g_try_malloc(size);
if (!value) {
goto out_err;
}
@@ -2806,8 +2805,6 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino,
const char *in_name,
fuse_reply_xattr(req, ret);
}
out_free:
- free(value);
-
if (fd >= 0) {
close(fd);
}
@@ -2826,7 +2823,7 @@ out:
static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)
{
struct lo_data *lo = lo_data(req);
- char *value = NULL;
+ g_autofree char *value = NULL;
char procname[64];
struct lo_inode *inode;
ssize_t ret;
@@ -2848,7 +2845,7 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino,
size_t size)
size);
if (size) {
- value = malloc(size);
+ value = g_try_malloc(size);
if (!value) {
goto out_err;
}
@@ -2933,8 +2930,6 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino,
size_t size)
fuse_reply_xattr(req, ret);
}
out_free:
- free(value);
-
if (fd >= 0) {
close(fd);
}
--
2.25.1
- Re: [PATCH 1/8] virtiofsd: Changed allocations of fuse_req to GLib functions, (continued)
- [PATCH 2/8] virtiofds: Changed allocations of iovec to GLib's functions, Mahmoud Mandour, 2021/03/19
- [PATCH 4/8] virtiofsd: Changed allocations of fuse_session to GLib's functions, Mahmoud Mandour, 2021/03/19
- [PATCH 3/8] virtiofsd: Changed fuse_pollhandle allocation to GLib's functions, Mahmoud Mandour, 2021/03/19
- [PATCH 6/8] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions, Mahmoud Mandour, 2021/03/19
- [PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions,
Mahmoud Mandour <=
- [PATCH 5/8] virtiofsd: Changed allocation of lo_map_elems to GLib's functions, Mahmoud Mandour, 2021/03/19
- [PATCH 8/8] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib, Mahmoud Mandour, 2021/03/19
- Re: [PATCH 0/8] virtiofsd: Changed various allocations to GLib functions, Mahmoud Mandour, 2021/03/19