From: Dehan Meng <demeng@redhat.com>
To: qemu-devel@nongnu.org
Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com,
peter.maydell@linaro.org, berrange@redhat.com
Subject: [PATCH v4 5/5] qemu-ga: Replace g_new0() with g_autoptr()
Date: Tue, 22 Oct 2024 22:29:48 +0800 [thread overview]
Message-ID: <20241022142948.531325-6-demeng@redhat.com> (raw)
In-Reply-To: <20241022142948.531325-1-demeng@redhat.com>
Replace g_new0() with g_autoptr() to simplify the code
Signed-off-by: Dehan Meng <demeng@redhat.com>
---
qga/commands-linux.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 9fb31956b4..ee4f345938 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2158,15 +2158,13 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
continue;
}
- GuestNetworkRoute *route = g_new0(GuestNetworkRoute, 1);
+ g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);
route->destination = hex_to_ip_address(destination, 1);
- if (route->destination == NULL) {
- g_free(route);
+ route->iface = g_strdup(iface);
+ if (route->destination == NULL || route->iface == NULL) {
continue;
}
- route->iface = g_strdup(iface);
- route->destination = hex_to_ip_address(destination, 1);
route->source = hex_to_ip_address(source, 1);
route->nexthop = hex_to_ip_address(next_hop, 1);
route->desprefixlen = g_strdup_printf("%d", des_prefixlen);
@@ -2188,15 +2186,13 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
continue;
}
- GuestNetworkRoute *route = g_new0(GuestNetworkRoute, 1);
+ g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);
route->destination = hex_to_ip_address(destination, 1);
- if (route->destination == NULL) {
- g_free(route);
+ route->iface = g_strdup(iface);
+ if (route->destination == NULL || route->iface == NULL) {
continue;
}
- route->iface = g_strdup(iface);
- route->destination = hex_to_ip_address(&destination, 0);
route->gateway = hex_to_ip_address(&gateway, 0);
route->mask = hex_to_ip_address(&mask, 0);
route->metric = metric;
--
2.40.1
next prev parent reply other threads:[~2024-10-22 14:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 14:29 [PATCH v4 0/5] qemu-ga: Hanle memory leak and simplify code Dehan Meng
2024-10-22 14:29 ` [PATCH v4 1/5] qemu-ga: 'Null' check for mandatory parameters Dehan Meng
2024-10-25 12:48 ` Daniel P. Berrangé
2024-10-28 1:49 ` Dehan Meng
2024-10-22 14:29 ` [PATCH v4 2/5] qemu-ga: Initialize correctly so getline works properly Dehan Meng
2024-10-22 14:29 ` [PATCH v4 3/5] qemu-ga: Avoiding freeing line prematurely Dehan Meng
2024-10-22 14:29 ` [PATCH v4 4/5] qemu-ga: For correcting code style Dehan Meng
2024-10-22 14:29 ` Dehan Meng [this message]
2024-10-25 12:50 ` [PATCH v4 5/5] qemu-ga: Replace g_new0() with g_autoptr() Daniel P. Berrangé
2024-10-28 1:49 ` Dehan Meng
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=20241022142948.531325-6-demeng@redhat.com \
--to=demeng@redhat.com \
--cc=berrange@redhat.com \
--cc=kkostiuk@redhat.com \
--cc=michael.roth@amd.com \
--cc=peter.maydell@linaro.org \
--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).