diff options
| author | rwatson <rwatson@FreeBSD.org> | 2008-06-13 22:14:15 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2008-06-13 22:14:15 +0000 |
| commit | f07c38e84aa87001718dc3e4625bc30c9af3be89 (patch) | |
| tree | 73b558170fb5c7801f3fea0db4e1007d0362a79d /sys/security/mac_test | |
| parent | 0dd1763fd61cb2c8ebe8fb606c1b6ee159ffd6e3 (diff) | |
| download | FreeBSD-src-f07c38e84aa87001718dc3e4625bc30c9af3be89.zip FreeBSD-src-f07c38e84aa87001718dc3e4625bc30c9af3be89.tar.gz | |
The TrustedBSD MAC Framework named struct ipq instances 'ipq', which is the
same as the global variable defined in ip_input.c. Instead, adopt the name
'q' as found in about 1/2 of uses in ip_input.c, preventing a collision on
the name. This is non-harmful, but means that search and replace on the
global works less well (as in the virtualization work), as well as indexing
tools.
MFC after: 1 week
Reported by: julian
Diffstat (limited to 'sys/security/mac_test')
| -rw-r--r-- | sys/security/mac_test/mac_test.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index 14d3b80..bacebd4 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -553,11 +553,11 @@ test_inpcb_sosetlabel(struct socket *so, struct label *solabel, COUNTER_DECL(ipq_create); static void test_ipq_create(struct mbuf *fragment, struct label *fragmentlabel, - struct ipq *ipq, struct label *ipqlabel) + struct ipq *q, struct label *qlabel) { LABEL_CHECK(fragmentlabel, MAGIC_MBUF); - LABEL_CHECK(ipqlabel, MAGIC_IPQ); + LABEL_CHECK(qlabel, MAGIC_IPQ); COUNTER_INC(ipq_create); } @@ -588,11 +588,11 @@ test_ipq_init_label(struct label *label, int flag) COUNTER_DECL(ipq_match); static int test_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, - struct ipq *ipq, struct label *ipqlabel) + struct ipq *q, struct label *qlabel) { LABEL_CHECK(fragmentlabel, MAGIC_MBUF); - LABEL_CHECK(ipqlabel, MAGIC_IPQ); + LABEL_CHECK(qlabel, MAGIC_IPQ); COUNTER_INC(ipq_match); return (1); @@ -600,23 +600,23 @@ test_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, COUNTER_DECL(ipq_reassemble); static void -test_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *m, +test_ipq_reassemble(struct ipq *q, struct label *qlabel, struct mbuf *m, struct label *mlabel) { - LABEL_CHECK(ipqlabel, MAGIC_IPQ); + LABEL_CHECK(qlabel, MAGIC_IPQ); LABEL_CHECK(mlabel, MAGIC_MBUF); COUNTER_INC(ipq_reassemble); } COUNTER_DECL(ipq_update); static void -test_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +test_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { LABEL_CHECK(mlabel, MAGIC_MBUF); - LABEL_CHECK(ipqlabel, MAGIC_IPQ); + LABEL_CHECK(qlabel, MAGIC_IPQ); COUNTER_INC(ipq_update); } |
