openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change 'int isTempChain' to bool in nwfilter 

The 'int isTempChain' parameter to various nwfilter methods
only takes two values so should be a bool type.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-03-14 16:00:49 +00:00
parent 741c855e0e
commit 7dd1c91a11
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -676,7 +676,7 @@ static void
_iptablesRemoveRootChain(virBufferPtr buf, _iptablesRemoveRootChain(virBufferPtr buf,
char prefix, char prefix,
bool incoming, const char *ifname, bool incoming, const char *ifname,
int isTempChain) bool isTempChain)
{ {
char chain[MAX_CHAINNAME_LENGTH]; char chain[MAX_CHAINNAME_LENGTH];
char chainPrefix[2] = { char chainPrefix[2] = {
@ -706,7 +706,7 @@ iptablesRemoveRootChain(virBufferPtr buf,
bool incoming, bool incoming,
const char *ifname) const char *ifname)
{ {
_iptablesRemoveRootChain(buf, prefix, incoming, ifname, 0); _iptablesRemoveRootChain(buf, prefix, incoming, ifname, false);
} }
@ -717,7 +717,7 @@ iptablesRemoveTmpRootChain(virBufferPtr buf,
const char *ifname) const char *ifname)
{ {
_iptablesRemoveRootChain(buf, prefix, _iptablesRemoveRootChain(buf, prefix,
incoming, ifname, 1); incoming, ifname, true);
} }
@ -817,7 +817,7 @@ _iptablesUnlinkRootChain(virBufferPtr buf,
const char *basechain, const char *basechain,
char prefix, char prefix,
bool incoming, const char *ifname, bool incoming, const char *ifname,
int isTempChain) bool isTempChain)
{ {
char chain[MAX_CHAINNAME_LENGTH]; char chain[MAX_CHAINNAME_LENGTH];
char chainPrefix[2] = { char chainPrefix[2] = {
@ -863,7 +863,7 @@ iptablesUnlinkRootChain(virBufferPtr buf,
bool incoming, const char *ifname) bool incoming, const char *ifname)
{ {
_iptablesUnlinkRootChain(buf, _iptablesUnlinkRootChain(buf,
basechain, prefix, incoming, ifname, 0); basechain, prefix, incoming, ifname, false);
} }
@ -874,7 +874,7 @@ iptablesUnlinkTmpRootChain(virBufferPtr buf,
bool incoming, const char *ifname) bool incoming, const char *ifname)
{ {
_iptablesUnlinkRootChain(buf, _iptablesUnlinkRootChain(buf,
basechain, prefix, incoming, ifname, 1); basechain, prefix, incoming, ifname, true);
} }
@ -2890,7 +2890,7 @@ ebtablesLinkTmpRootChain(virBufferPtr buf,
static void static void
_ebtablesRemoveRootChain(virBufferPtr buf, _ebtablesRemoveRootChain(virBufferPtr buf,
bool incoming, const char *ifname, bool incoming, const char *ifname,
int isTempChain) bool isTempChain)
{ {
char chain[MAX_CHAINNAME_LENGTH]; char chain[MAX_CHAINNAME_LENGTH];
char chainPrefix; char chainPrefix;
@ -2915,7 +2915,7 @@ static void
ebtablesRemoveRootChain(virBufferPtr buf, ebtablesRemoveRootChain(virBufferPtr buf,
bool incoming, const char *ifname) bool incoming, const char *ifname)
{ {
_ebtablesRemoveRootChain(buf, incoming, ifname, 0); _ebtablesRemoveRootChain(buf, incoming, ifname, false);
} }
@ -2923,14 +2923,14 @@ static void
ebtablesRemoveTmpRootChain(virBufferPtr buf, ebtablesRemoveTmpRootChain(virBufferPtr buf,
bool incoming, const char *ifname) bool incoming, const char *ifname)
{ {
_ebtablesRemoveRootChain(buf, incoming, ifname, 1); _ebtablesRemoveRootChain(buf, incoming, ifname, true);
} }
static void static void
_ebtablesUnlinkRootChain(virBufferPtr buf, _ebtablesUnlinkRootChain(virBufferPtr buf,
bool incoming, const char *ifname, bool incoming, const char *ifname,
int isTempChain) bool isTempChain)
{ {
char chain[MAX_CHAINNAME_LENGTH]; char chain[MAX_CHAINNAME_LENGTH];
char iodev = incoming ? 'i' : 'o'; char iodev = incoming ? 'i' : 'o';
@ -2958,7 +2958,7 @@ static void
ebtablesUnlinkRootChain(virBufferPtr buf, ebtablesUnlinkRootChain(virBufferPtr buf,
bool incoming, const char *ifname) bool incoming, const char *ifname)
{ {
_ebtablesUnlinkRootChain(buf, incoming, ifname, 0); _ebtablesUnlinkRootChain(buf, incoming, ifname, false);
} }
@ -2966,7 +2966,7 @@ static void
ebtablesUnlinkTmpRootChain(virBufferPtr buf, ebtablesUnlinkTmpRootChain(virBufferPtr buf,
bool incoming, const char *ifname) bool incoming, const char *ifname)
{ {
_ebtablesUnlinkRootChain(buf, incoming, ifname, 1); _ebtablesUnlinkRootChain(buf, incoming, ifname, true);
} }