[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] util/compatfd.c: Replaced a malloc with GLib's variant
From: |
Mahmoud Mandour |
Subject: |
[PATCH 5/8] util/compatfd.c: Replaced a malloc with GLib's variant |
Date: |
Sun, 14 Mar 2021 05:23:21 +0200 |
Replaced a malloc() call and its respective free() call with
GLib's g_try_malloc() and g_free().
Also, did slight styling changes that were producing
style errors when using the checkpatch.pl script against
the file.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
---
util/compatfd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/util/compatfd.c b/util/compatfd.c
index ee47dd8089..834ddd0573 100644
--- a/util/compatfd.c
+++ b/util/compatfd.c
@@ -20,8 +20,7 @@
#include <sys/syscall.h>
#endif
-struct sigfd_compat_info
-{
+struct sigfd_compat_info {
sigset_t mask;
int fd;
};
@@ -53,8 +52,9 @@ static void *sigwait_compat(void *opaque)
len = write(info->fd, (char *)&buffer + offset,
sizeof(buffer) - offset);
- if (len == -1 && errno == EINTR)
+ if (len == -1 && errno == EINTR) {
continue;
+ }
if (len <= 0) {
return NULL;
@@ -72,14 +72,14 @@ static int qemu_signalfd_compat(const sigset_t *mask)
QemuThread thread;
int fds[2];
- info = malloc(sizeof(*info));
+ info = g_try_malloc(sizeof(*info));
if (info == NULL) {
errno = ENOMEM;
return -1;
}
if (pipe(fds) == -1) {
- free(info);
+ g_free(info);
return -1;
}
--
2.25.1
[PATCH 4/8] target/xtensa: Replaced malloc/free with GLib's variants, Mahmoud Mandour, 2021/03/13
[PATCH 7/8] tools/virtiofsd/fuse_opt.c: Replaced a malloc with GLib's g_try_malloc, Mahmoud Mandour, 2021/03/13
[PATCH 3/8] hw/audio/fmopl.c: Replaced calls to malloc with GLib's variants, Mahmoud Mandour, 2021/03/13