[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/12] virtiofsd/passthrough_ll.c: Changed local allocations to GL
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 11/12] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions |
Date: |
Thu, 6 May 2021 19:56:40 +0100 |
From: Mahmoud Mandour <ma.mandourr@gmail.com>
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>
---
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 406b5bd10e..49c21fd855 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,
@@ -2732,7 +2731,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;
@@ -2773,7 +2772,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;
}
@@ -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);
}
out_free:
- free(value);
-
if (fd >= 0) {
close(fd);
}
@@ -2832,7 +2829,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;
@@ -2854,7 +2851,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;
}
@@ -2939,8 +2936,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.31.1
- [PULL 00/12] virtiofs queue, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 01/12] virtiofsd: Fix side-effect in assert(), Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 02/12] virtiofsd: Allow use "-o xattrmap" without "-o xattr", Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 04/12] virtiofs: Fixup printf args, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 05/12] virtiofsd: Don't assume header layout, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 03/12] virtiofsd: Add help for -o xattr-mapping, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 06/12] virtiofsd: Changed allocations of fuse_req to GLib functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 07/12] virtiofsd: Changed allocations of iovec to GLib's functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 08/12] virtiofsd: Changed allocations of fuse_session to GLib's functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 11/12] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions,
Dr. David Alan Gilbert (git) <=
- [PULL 12/12] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 10/12] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 09/12] virtiofsd: Changed allocation of lo_map_elems to GLib's functions, Dr. David Alan Gilbert (git), 2021/05/06
- Re: [PULL 00/12] virtiofs queue, Peter Maydell, 2021/05/11