External/libvirt
1
0
Fork 0
Code

nwfilter: use g_auto() for all virBuffers

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Laine Stump 2020-07-02 22:39:38 -04:00
parent 817519e900
commit 5f0f8f6c5d
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -190,7 +190,7 @@ _printDataType(virNWFilterVarCombIterPtr vars,
bool done; bool done;
char *data; char *data;
uint8_t ctr; uint8_t ctr;
virBuffer vb = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) vb = VIR_BUFFER_INITIALIZER;
char *flags; char *flags;
if (printVar(vars, buf, bufsize, item, &done) < 0) if (printVar(vars, buf, bufsize, item, &done) < 0)
@ -1528,7 +1528,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
static int static int
printStateMatchFlags(int32_t flags, char **bufptr) printStateMatchFlags(int32_t flags, char **bufptr)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virNWFilterPrintStateMatchFlags(&buf, virNWFilterPrintStateMatchFlags(&buf,
"", "",
flags, flags,
@ -1798,7 +1798,7 @@ ebtablesCreateRuleInstance(virFirewallPtr fw,
bool hasMask = false; bool hasMask = false;
virFirewallRulePtr fwrule; virFirewallRulePtr fwrule;
int ret = -1; int ret = -1;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
if (STREQ(chainSuffix, if (STREQ(chainSuffix,
virNWFilterChainSuffixTypeToString( virNWFilterChainSuffixTypeToString(
@ -2423,8 +2423,6 @@ ebtablesCreateRuleInstance(virFirewallPtr fw,
ret = 0; ret = 0;
cleanup: cleanup:
virBufferFreeAndReset(&buf);
return ret; return ret;
} }

6
src/nwfilter/nwfilter_gentech_driver.c
View File

@ -426,15 +426,13 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter,
if (!virNWFilterVarAccessIsAvailable(rule->varAccess[j], if (!virNWFilterVarAccessIsAvailable(rule->varAccess[j],
vars)) { vars)) {
char *varAccess; char *varAccess;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virNWFilterVarAccessPrint(rule->varAccess[j], &buf); virNWFilterVarAccessPrint(rule->varAccess[j], &buf);
val = virNWFilterVarValueCreateSimpleCopyValue("1"); val = virNWFilterVarValueCreateSimpleCopyValue("1");
if (!val) { if (!val)
virBufferFreeAndReset(&buf);
return -1; return -1;
}
varAccess = virBufferContentAndReset(&buf); varAccess = virBufferContentAndReset(&buf);
rc = virHashUpdateEntry(missing_vars, varAccess, val); rc = virHashUpdateEntry(missing_vars, varAccess, val);

2
src/nwfilter/nwfilter_learnipaddr.c
View File

@ -397,7 +397,7 @@ learnIPAddressThread(void *arg)
req->binding->portdevname); req->binding->portdevname);
int dhcp_opts_len; int dhcp_opts_len;
char macaddr[VIR_MAC_STRING_BUFLEN]; char macaddr[VIR_MAC_STRING_BUFLEN];
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
char *filter = NULL; char *filter = NULL;
uint16_t etherType; uint16_t etherType;
bool showError = true; bool showError = true;