From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 2 Aug 2023 13:42:31 +0000 (+0200)
Subject: virt-aa-helper: Use struct zero initializer instead of memset
X-Git-Tag: v9.7.0-rc1~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b4ce69251373379d63b539050ab94c579fd1616;p=thirdparty%2Flibvirt.git

virt-aa-helper: Use struct zero initializer instead of memset

This is similar to the previous commit, except this is for a
different type (vahControl) and also fixes the case where _ctl is
passed not initialized to vah_error() (via ctl pointer so that's
probably why compilers don't complain).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
---

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 3ee59b32bb..da1e4fc3e4 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1433,7 +1433,8 @@ vahParseArgv(vahControl * ctl, int argc, char **argv)
 int
 main(int argc, char **argv)
 {
-    vahControl _ctl, *ctl = &_ctl;
+    vahControl _ctl = { 0 };
+    vahControl *ctl = &_ctl;
     int rc = -1;
     char *profile = NULL;
     char *include_file = NULL;
@@ -1466,8 +1467,6 @@ main(int argc, char **argv)
     else
         progname++;
 
-    memset(ctl, 0, sizeof(vahControl));
-
     if (vahParseArgv(ctl, argc, argv) != 0)
         vah_error(ctl, 1, _("could not parse arguments"));