]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virfirewall: Don't check OOM in ADD_ARG macro
authorPeter Krempa <pkrempa@redhat.com>
Tue, 23 Feb 2021 16:34:35 +0000 (17:34 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 2 Mar 2021 08:50:19 +0000 (09:50 +0100)
VIR_RESIZE_N can't fail nowadays, adjust the macro.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
src/util/virfirewall.c

index 6b04a8011fd3af15c96281d799dd0d906010480c..95962568f5d39180e2119c961cbb2efb10f9c928 100644 (file)
@@ -262,10 +262,9 @@ void virFirewallFree(virFirewallPtr firewall)
 
 #define ADD_ARG(rule, str) \
     do { \
-        if (VIR_RESIZE_N(rule->args, \
-                         rule->argsAlloc, \
-                         rule->argsLen, 1) < 0) \
-            goto no_memory; \
+        ignore_value(VIR_RESIZE_N(rule->args, \
+                                  rule->argsAlloc, \
+                                  rule->argsLen, 1)); \
  \
         rule->args[rule->argsLen++] = g_strdup(str); \
     } while (0)
@@ -433,9 +432,6 @@ void virFirewallRuleAddArg(virFirewallPtr firewall,
     ADD_ARG(rule, arg);
 
     return;
-
- no_memory:
-    firewall->err = ENOMEM;
 }
 
 
@@ -455,9 +451,6 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firewall,
     ADD_ARG(rule, arg);
 
     return;
-
- no_memory:
-    firewall->err = ENOMEM;
 }
 
 
@@ -473,9 +466,6 @@ void virFirewallRuleAddArgSet(virFirewallPtr firewall,
     }
 
     return;
-
- no_memory:
-    firewall->err = ENOMEM;
 }
 
 
@@ -496,10 +486,6 @@ void virFirewallRuleAddArgList(virFirewallPtr firewall,
     va_end(list);
 
     return;
-
- no_memory:
-    firewall->err = ENOMEM;
-    va_end(list);
 }