* [PATCH -next] apparmor: Remove unused parameter L1 in macro next_comb
@ 2024-09-02 7:39 Jinjie Ruan
2024-11-09 20:39 ` John Johansen
0 siblings, 1 reply; 2+ messages in thread
From: Jinjie Ruan @ 2024-09-02 7:39 UTC (permalink / raw)
To: john.johansen, paul, jmorris, serge, ruanjinjie, apparmor,
linux-security-module
In the macro definition of next_comb(), a parameter L1 is accepted,
but it is not used. Hence, it should be removed.
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
security/apparmor/include/label.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/apparmor/include/label.h b/security/apparmor/include/label.h
index 2a72e6b17d68..2635eef0ae2b 100644
--- a/security/apparmor/include/label.h
+++ b/security/apparmor/include/label.h
@@ -160,7 +160,7 @@ int aa_label_next_confined(struct aa_label *l, int i);
#define label_for_each_cont(I, L, P) \
for (++((I).i); ((P) = (L)->vec[(I).i]); ++((I).i))
-#define next_comb(I, L1, L2) \
+#define next_comb(I, L2) \
do { \
(I).j++; \
if ((I).j >= (L2)->size) { \
@@ -174,7 +174,7 @@ do { \
#define label_for_each_comb(I, L1, L2, P1, P2) \
for ((I).i = (I).j = 0; \
((P1) = (L1)->vec[(I).i]) && ((P2) = (L2)->vec[(I).j]); \
- (I) = next_comb(I, L1, L2))
+ (I) = next_comb(I, L2))
#define fn_for_each_comb(L1, L2, P1, P2, FN) \
({ \
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] apparmor: Remove unused parameter L1 in macro next_comb
2024-09-02 7:39 [PATCH -next] apparmor: Remove unused parameter L1 in macro next_comb Jinjie Ruan
@ 2024-11-09 20:39 ` John Johansen
0 siblings, 0 replies; 2+ messages in thread
From: John Johansen @ 2024-11-09 20:39 UTC (permalink / raw)
To: Jinjie Ruan, paul, jmorris, serge, apparmor,
linux-security-module
On 9/2/24 00:39, Jinjie Ruan wrote:
> In the macro definition of next_comb(), a parameter L1 is accepted,
> but it is not used. Hence, it should be removed.
>
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Acked-by: John Johansen <john.johansen@canonical.com>
I have pulled this into my tree
> ---
> security/apparmor/include/label.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/apparmor/include/label.h b/security/apparmor/include/label.h
> index 2a72e6b17d68..2635eef0ae2b 100644
> --- a/security/apparmor/include/label.h
> +++ b/security/apparmor/include/label.h
> @@ -160,7 +160,7 @@ int aa_label_next_confined(struct aa_label *l, int i);
> #define label_for_each_cont(I, L, P) \
> for (++((I).i); ((P) = (L)->vec[(I).i]); ++((I).i))
>
> -#define next_comb(I, L1, L2) \
> +#define next_comb(I, L2) \
> do { \
> (I).j++; \
> if ((I).j >= (L2)->size) { \
> @@ -174,7 +174,7 @@ do { \
> #define label_for_each_comb(I, L1, L2, P1, P2) \
> for ((I).i = (I).j = 0; \
> ((P1) = (L1)->vec[(I).i]) && ((P2) = (L2)->vec[(I).j]); \
> - (I) = next_comb(I, L1, L2))
> + (I) = next_comb(I, L2))
>
> #define fn_for_each_comb(L1, L2, P1, P2, FN) \
> ({ \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-09 20:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-02 7:39 [PATCH -next] apparmor: Remove unused parameter L1 in macro next_comb Jinjie Ruan
2024-11-09 20:39 ` John Johansen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).