[libvirt PATCH 9/9] admin: use struct zero initializer instead of memset
This is a more concise approach and guarantees there is
no time window where the struct is uninitialized.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/admin/admin_remote.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
index 5322f087ec..3ae20ff373 100644
--- a/src/admin/admin_remote.c
+++ b/src/admin/admin_remote.c
@@ -232,14 +232,12 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPtr srv,
int rv = -1;
remoteAdminPriv *priv = srv->conn->privateData;
admin_server_get_threadpool_parameters_args args;
- admin_server_get_threadpool_parameters_ret ret;
+ admin_server_get_threadpool_parameters_ret ret = {0};
VIR_LOCK_GUARD lock = virObjectLockGuard(priv);
args.flags = flags;
make_nonnull_server(&args.srv, srv);
- memset(&ret, 0, sizeof(ret));
-
if (call(srv->conn, 0, ADMIN_PROC_SERVER_GET_THREADPOOL_PARAMETERS,
(xdrproc_t)xdr_admin_server_get_threadpool_parameters_args, (char *)
&args,
(xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *)
&ret) == -1)
@@ -302,14 +300,12 @@ remoteAdminClientGetInfo(virAdmClientPtr client,
int rv = -1;
remoteAdminPriv *priv = client->srv->conn->privateData;
admin_client_get_info_args args;
- admin_client_get_info_ret ret;
+ admin_client_get_info_ret ret = {0};
VIR_LOCK_GUARD lock = virObjectLockGuard(priv);
args.flags = flags;
make_nonnull_client(&args.clnt, client);
- memset(&ret, 0, sizeof(ret));
-
if (call(client->srv->conn, 0, ADMIN_PROC_CLIENT_GET_INFO,
(xdrproc_t)xdr_admin_client_get_info_args, (char *) &args,
(xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret) == -1)
@@ -337,15 +333,13 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv,
{
int rv = -1;
admin_server_get_client_limits_args args;
- admin_server_get_client_limits_ret ret;
+ admin_server_get_client_limits_ret ret = {0};
remoteAdminPriv *priv = srv->conn->privateData;
VIR_LOCK_GUARD lock = virObjectLockGuard(priv);
args.flags = flags;
make_nonnull_server(&args.srv, srv);
- memset(&ret, 0, sizeof(ret));
-
if (call(srv->conn, 0, ADMIN_PROC_SERVER_GET_CLIENT_LIMITS,
(xdrproc_t) xdr_admin_server_get_client_limits_args,
(char *) &args,
@@ -410,13 +404,11 @@ remoteAdminConnectGetLoggingOutputs(virAdmConnectPtr conn,
int rv = -1;
remoteAdminPriv *priv = conn->privateData;
admin_connect_get_logging_outputs_args args;
- admin_connect_get_logging_outputs_ret ret;
+ admin_connect_get_logging_outputs_ret ret = {0};
VIR_LOCK_GUARD lock = virObjectLockGuard(priv);
args.flags = flags;
- memset(&ret, 0, sizeof(ret));
-
if (call(conn,
0,
ADMIN_PROC_CONNECT_GET_LOGGING_OUTPUTS,
@@ -442,13 +434,11 @@ remoteAdminConnectGetLoggingFilters(virAdmConnectPtr conn,
int rv = -1;
remoteAdminPriv *priv = conn->privateData;
admin_connect_get_logging_filters_args args;
- admin_connect_get_logging_filters_ret ret;
+ admin_connect_get_logging_filters_ret ret = {0};
VIR_LOCK_GUARD lock = virObjectLockGuard(priv);
args.flags = flags;
- memset(&ret, 0, sizeof(ret));
-
if (call(conn,
0,
ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS,
--
2.38.1