]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
nwfilter: Use g_strdup_printf() instead of virAsprintf()
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 22 Oct 2019 13:26:14 +0000 (15:26 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 12 Nov 2019 15:15:58 +0000 (16:15 +0100)
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
src/nwfilter/nwfilter_dhcpsnoop.c

index 665e7bff9c67563eed764eea83b13bdb1f58fa58..4e77ca0d2d63be0071d72b7f93e8cae0534d03c1 100644 (file)
@@ -315,8 +315,7 @@ virNWFilterSnoopActivate(virNWFilterSnoopReqPtr req)
 {
     char *key;
 
-    if (virAsprintf(&key, "%p-%d", req, req->ifindex) < 0)
-        return NULL;
+    key = g_strdup_printf("%p-%d", req, req->ifindex);
 
     virNWFilterSnoopActiveLock();
 
@@ -1081,9 +1080,7 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac,
          * extend the filter with the macaddr of the VM; filter the
          * more unlikely parameters first, then go for the MAC
          */
-        if (virAsprintf(&ext_filter,
-                        "%s and ether src %s", filter, macaddr) < 0)
-            return NULL;
+        ext_filter = g_strdup_printf("%s and ether src %s", filter, macaddr);
     } else {
         /*
          * Some DHCP servers respond via MAC broadcast; we rely on later
@@ -1766,11 +1763,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey,
     }
 
     /* time intf ip dhcpserver */
-    if (virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout,
-                    ifkey, ipstr, dhcpstr) < 0) {
-        ret = -1;
-        goto cleanup;
-    }
+    lbuf = g_strdup_printf("%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr);
     len = strlen(lbuf);
 
     if (safewrite(lfd, lbuf, len) != len) {