[libvirt] [PATCH 3/4] nwfilter: change two-state int parameters to bool
---
src/nwfilter/nwfilter_ebiptables_driver.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index ffb597a..c4fcde6 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -248,9 +248,9 @@ static int
printVar(virNWFilterVarCombIterPtr vars,
char *buf, int bufsize,
nwItemDescPtr item,
- int *done)
+ bool *done)
{
- *done = 0;
+ *done = false;
if ((item->flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) {
const char *val;
@@ -271,7 +271,7 @@ printVar(virNWFilterVarCombIterPtr vars,
return -1;
}
- *done = 1;
+ *done = true;
}
return 0;
}
@@ -283,7 +283,7 @@ _printDataType(virNWFilterVarCombIterPtr vars,
nwItemDescPtr item,
bool asHex, bool directionIn)
{
- int done;
+ bool done;
char *data;
uint8_t ctr;
virBuffer vb = VIR_BUFFER_INITIALIZER;
@@ -971,7 +971,7 @@ static int
iptablesHandleSrcMacAddr(virBufferPtr buf,
virNWFilterVarCombIterPtr vars,
nwItemDescPtr srcMacAddr,
- int directionIn,
+ bool directionIn,
bool *srcmacskipped)
{
char macaddr[VIR_MAC_STRING_BUFLEN];
@@ -1008,7 +1008,7 @@ iptablesHandleIpHdr(virBufferPtr buf,
virBufferPtr afterStateMatch,
virNWFilterVarCombIterPtr vars,
ipHdrDataDefPtr ipHdr,
- int directionIn,
+ bool directionIn,
bool *skipRule, bool *skipMatch,
virBufferPtr prefix)
{
@@ -1204,7 +1204,7 @@ static int
iptablesHandlePortData(virBufferPtr buf,
virNWFilterVarCombIterPtr vars,
portDataDefPtr portData,
- int directionIn)
+ bool directionIn)
{
char portstr[20];
const char *sport = "--sport";
@@ -1270,7 +1270,7 @@ err_exit:
static void
-iptablesEnforceDirection(int directionIn,
+iptablesEnforceDirection(bool directionIn,
virNWFilterRuleDefPtr rule,
virBufferPtr buf)
{
@@ -1313,7 +1313,7 @@ iptablesEnforceDirection(int directionIn,
* pointed to by res, != 0 otherwise.
*/
static int
-_iptablesCreateRuleInstance(int directionIn,
+_iptablesCreateRuleInstance(bool directionIn,
const char *chainPrefix,
virNWFilterDefPtr nwfilter,
virNWFilterRuleDefPtr rule,
@@ -1801,7 +1801,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
bool isIPv6)
{
int rc;
- int directionIn = 0;
+ bool directionIn = false;
char chainPrefix[2];
bool maySkipICMP, inout = false;
char *matchState = NULL;
@@ -1809,7 +1809,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
- directionIn = 1;
+ directionIn = true;
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
}
@@ -1926,7 +1926,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter,
bool isIPv6)
{
int rc;
- int directionIn = 0;
+ bool directionIn = false;
char chainPrefix[2];
bool needState = true;
bool maySkipICMP, inout = false;
@@ -1944,7 +1944,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter,
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
- directionIn = 1;
+ directionIn = true;
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
if (inout)
needState = false;
--
1.8.1.5