projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils.h: Avoid name clashes for setbit/delbit/hasbit
[project/firewall3.git]
/
iptables.c
diff --git
a/iptables.c
b/iptables.c
index
96fba12
..
e54ea53
100644
(file)
--- a/
iptables.c
+++ b/
iptables.c
@@
-1030,7
+1030,7
@@
fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time)
{
for (i = 1, p = buf; i < 32; i++)
{
{
for (i = 1, p = buf; i < 32; i++)
{
- if (hasbit(time->monthdays, i))
+ if (
fw3_
hasbit(time->monthdays, i))
{
if (p > buf)
*p++ = ',';
{
if (p > buf)
*p++ = ',';
@@
-1039,14
+1039,14
@@
fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time)
}
}
}
}
- fw3_ipt_rule_addarg(r, hasbit(time->monthdays, 0), "--monthdays", buf);
+ fw3_ipt_rule_addarg(r,
fw3_
hasbit(time->monthdays, 0), "--monthdays", buf);
}
if (time->weekdays & 0xFE)
{
for (i = 1, p = buf; i < 8; i++)
{
}
if (time->weekdays & 0xFE)
{
for (i = 1, p = buf; i < 8; i++)
{
- if (hasbit(time->weekdays, i))
+ if (
fw3_
hasbit(time->weekdays, i))
{
if (p > buf)
*p++ = ',';
{
if (p > buf)
*p++ = ',';
@@
-1055,7
+1055,7
@@
fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time)
}
}
}
}
- fw3_ipt_rule_addarg(r, hasbit(time->weekdays, 0), "--weekdays", buf);
+ fw3_ipt_rule_addarg(r,
fw3_
hasbit(time->weekdays, 0), "--weekdays", buf);
}
}
}
}