Skip to content

Commit 470948b

Browse files
committed
selinux: fix style issues in security/selinux/ss/mls.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 dfd9bb4 commit 470948b

File tree

1 file changed

+19
-39
lines changed

1 file changed

+19
-39
lines changed

security/selinux/ss/mls.h

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@
44
*
55
* Author : Stephen Smalley, <[email protected]>
66
*/
7+
78
/*
89
* Updated: Trusted Computer Solutions, Inc. <[email protected]>
10+
* Support for enhanced MLS infrastructure.
11+
* Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
912
*
10-
* Support for enhanced MLS infrastructure.
11-
*
12-
* Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
13-
*/
14-
/*
1513
* Updated: Hewlett-Packard <[email protected]>
16-
*
17-
* Added support to import/export the MLS label from NetLabel
18-
*
19-
* (c) Copyright Hewlett-Packard Development Company, L.P., 2006
14+
* Added support to import/export the MLS label from NetLabel
15+
* Copyright (X) Hewlett-Packard Development Company, L.P., 2006
2016
*/
2117

2218
#ifndef _SS_MLS_H_
@@ -35,47 +31,32 @@ int mls_context_isvalid(struct policydb *p, struct context *c);
3531
int mls_range_isvalid(struct policydb *p, struct mls_range *r);
3632
int mls_level_isvalid(struct policydb *p, struct mls_level *l);
3733

38-
int mls_context_to_sid(struct policydb *p,
39-
char oldc,
40-
char *scontext,
41-
struct context *context,
42-
struct sidtab *s,
43-
u32 def_sid);
34+
int mls_context_to_sid(struct policydb *p, char oldc, char *scontext,
35+
struct context *context, struct sidtab *s, u32 def_sid);
4436

4537
int mls_from_string(struct policydb *p, char *str, struct context *context,
4638
gfp_t gfp_mask);
4739

4840
int mls_range_set(struct context *context, struct mls_range *range);
4941

50-
int mls_convert_context(struct policydb *oldp,
51-
struct policydb *newp,
52-
struct context *oldc,
53-
struct context *newc);
42+
int mls_convert_context(struct policydb *oldp, struct policydb *newp,
43+
struct context *oldc, struct context *newc);
5444

55-
int mls_compute_sid(struct policydb *p,
56-
struct context *scontext,
57-
struct context *tcontext,
58-
u16 tclass,
59-
u32 specified,
60-
struct context *newcontext,
61-
bool sock);
45+
int mls_compute_sid(struct policydb *p, struct context *scontext,
46+
struct context *tcontext, u16 tclass, u32 specified,
47+
struct context *newcontext, bool sock);
6248

63-
int mls_setup_user_range(struct policydb *p,
64-
struct context *fromcon, struct user_datum *user,
65-
struct context *usercon);
49+
int mls_setup_user_range(struct policydb *p, struct context *fromcon,
50+
struct user_datum *user, struct context *usercon);
6651

6752
#ifdef CONFIG_NETLABEL
68-
void mls_export_netlbl_lvl(struct policydb *p,
69-
struct context *context,
53+
void mls_export_netlbl_lvl(struct policydb *p, struct context *context,
7054
struct netlbl_lsm_secattr *secattr);
71-
void mls_import_netlbl_lvl(struct policydb *p,
72-
struct context *context,
55+
void mls_import_netlbl_lvl(struct policydb *p, struct context *context,
7356
struct netlbl_lsm_secattr *secattr);
74-
int mls_export_netlbl_cat(struct policydb *p,
75-
struct context *context,
57+
int mls_export_netlbl_cat(struct policydb *p, struct context *context,
7658
struct netlbl_lsm_secattr *secattr);
77-
int mls_import_netlbl_cat(struct policydb *p,
78-
struct context *context,
59+
int mls_import_netlbl_cat(struct policydb *p, struct context *context,
7960
struct netlbl_lsm_secattr *secattr);
8061
#else
8162
static inline void mls_export_netlbl_lvl(struct policydb *p,
@@ -112,5 +93,4 @@ static inline u32 mls_range_hash(const struct mls_range *r, u32 hash)
11293
return hash;
11394
}
11495

115-
#endif /* _SS_MLS_H */
116-
96+
#endif /* _SS_MLS_H */

0 commit comments

Comments
 (0)