From: Mahmoud Mandour <ma.mandourr@gmail.com>
To: qemu-devel@nongnu.org
Cc: Mahmoud Mandour <ma.mandourr@gmail.com>
Subject: [PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions
Date: Fri, 19 Mar 2021 15:25:26 +0200 [thread overview]
Message-ID: <20210319132527.3118-8-ma.mandourr@gmail.com> (raw)
In-Reply-To: <20210319132527.3118-1-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>
---
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
next prev parent reply other threads:[~2021-03-19 13:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 13:25 [PATCH 0/8] virtiofsd: Changed various allocations to GLib functions Mahmoud Mandour
2021-03-19 13:25 ` [PATCH 1/8] virtiofsd: Changed allocations of fuse_req " Mahmoud Mandour
2021-03-23 13:48 ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 2/8] virtiofds: Changed allocations of iovec to GLib's functions Mahmoud Mandour
2021-03-23 13:57 ` Stefan Hajnoczi
2021-03-24 12:57 ` Stefan Hajnoczi
2021-03-24 13:32 ` Mahmoud Mandour
2021-03-19 13:25 ` [PATCH 3/8] virtiofsd: Changed fuse_pollhandle allocation " Mahmoud Mandour
2021-03-23 14:03 ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 4/8] virtiofsd: Changed allocations of fuse_session " Mahmoud Mandour
2021-03-23 14:08 ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 5/8] virtiofsd: Changed allocation of lo_map_elems " Mahmoud Mandour
2021-03-23 14:09 ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 6/8] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions Mahmoud Mandour
2021-03-23 14:10 ` Stefan Hajnoczi
2021-03-19 13:25 ` Mahmoud Mandour [this message]
2021-03-23 14:13 ` [PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations " Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 8/8] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib Mahmoud Mandour
2021-03-23 14:15 ` Stefan Hajnoczi
[not found] ` <CAD-LL6iYvHZt8mJZdiHLyUYsDq3kBy0HrTR6_K0x6iCLE1POoA@mail.gmail.com>
2021-03-24 13:00 ` Stefan Hajnoczi
2021-03-19 13:47 ` [PATCH 0/8] virtiofsd: Changed various allocations to GLib functions Mahmoud Mandour
2021-03-22 15:52 ` Stefan Hajnoczi
2021-04-16 8:43 ` Mahmoud Mandour
2021-04-19 14:19 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210319132527.3118-8-ma.mandourr@gmail.com \
--to=ma.mandourr@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).