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

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>

diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 406b5bd..49c21fd 100644 (file)
--- 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;
     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;
     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;
     }
 
     err = ENOMEM;

-    buf = calloc(1, size);
+    buf = g_try_malloc0(size);

     if (!buf) {
         goto error;
     }
     if (!buf) {
         goto error;
     }


@@ -1755,7 +1755,6 @@ error:
     } else {
         fuse_reply_buf(req, buf, size - rem);
     }
     } 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,
 }
 
 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);
                         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;
     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) {
              ino, name, size);
 
     if (size) {

-        value = malloc(size);
+        value = g_try_malloc(size);

         if (!value) {
             goto out_err;
         }
         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:
         fuse_reply_xattr(req, ret);
     }
 out_free:

-    free(value);
-

     if (fd >= 0) {
         close(fd);
     }
     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);
 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;
     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) {
              size);
 
     if (size) {

-        value = malloc(size);
+        value = g_try_malloc(size);

         if (!value) {
             goto out_err;
         }
         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:
         fuse_reply_xattr(req, ret);
     }
 out_free:

-    free(value);
-

     if (fd >= 0) {
         close(fd);
     }
     if (fd >= 0) {
         close(fd);
     }