Skip to content

Commit 793f9ad

Browse files
committed
selinux: fix style issues in security/selinux/ss/mls_types.h
As part of on ongoing effort to perform more automated testing and provide more tools for individual developers to validate their patches before submitting, we are trying to make our code "clang-format clean". My hope is that once we have fixed all of our style "quirks", developers will be able to run clang-format on their patches to help avoid silly formatting problems and ensure their changes fit in well with the rest of the SELinux kernel code. Signed-off-by: Paul Moore <[email protected]>
1 parent 4afec36 commit 793f9ad

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

security/selinux/ss/mls_types.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
*
55
* Author : Stephen Smalley, <[email protected]>
66
*/
7+
78
/*
89
* Updated: Trusted Computer Solutions, Inc. <[email protected]>
9-
*
10-
* Support for enhanced MLS infrastructure.
11-
*
12-
* Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
10+
* Support for enhanced MLS infrastructure.
11+
* Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
1312
*/
1413

1514
#ifndef _SS_MLS_TYPES_H_
@@ -19,34 +18,35 @@
1918
#include "ebitmap.h"
2019

2120
struct mls_level {
22-
u32 sens; /* sensitivity */
23-
struct ebitmap cat; /* category set */
21+
u32 sens; /* sensitivity */
22+
struct ebitmap cat; /* category set */
2423
};
2524

2625
struct mls_range {
2726
struct mls_level level[2]; /* low == level[0], high == level[1] */
2827
};
2928

30-
static inline int mls_level_eq(const struct mls_level *l1, const struct mls_level *l2)
29+
static inline int mls_level_eq(const struct mls_level *l1,
30+
const struct mls_level *l2)
3131
{
32-
return ((l1->sens == l2->sens) &&
33-
ebitmap_cmp(&l1->cat, &l2->cat));
32+
return ((l1->sens == l2->sens) && ebitmap_cmp(&l1->cat, &l2->cat));
3433
}
3534

36-
static inline int mls_level_dom(const struct mls_level *l1, const struct mls_level *l2)
35+
static inline int mls_level_dom(const struct mls_level *l1,
36+
const struct mls_level *l2)
3737
{
3838
return ((l1->sens >= l2->sens) &&
3939
ebitmap_contains(&l1->cat, &l2->cat, 0));
4040
}
4141

4242
#define mls_level_incomp(l1, l2) \
43-
(!mls_level_dom((l1), (l2)) && !mls_level_dom((l2), (l1)))
43+
(!mls_level_dom((l1), (l2)) && !mls_level_dom((l2), (l1)))
4444

4545
#define mls_level_between(l1, l2, l3) \
46-
(mls_level_dom((l1), (l2)) && mls_level_dom((l3), (l1)))
46+
(mls_level_dom((l1), (l2)) && mls_level_dom((l3), (l1)))
4747

48-
#define mls_range_contains(r1, r2) \
49-
(mls_level_dom(&(r2).level[0], &(r1).level[0]) && \
50-
mls_level_dom(&(r1).level[1], &(r2).level[1]))
48+
#define mls_range_contains(r1, r2) \
49+
(mls_level_dom(&(r2).level[0], &(r1).level[0]) && \
50+
mls_level_dom(&(r1).level[1], &(r2).level[1]))
5151

52-
#endif /* _SS_MLS_TYPES_H_ */
52+
#endif /* _SS_MLS_TYPES_H_ */

0 commit comments

Comments
 (0)