From d4fa148ece041123e4dee5f8a6978e2086cd3325 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 22 Mar 2024 08:38:27 -0700 Subject: [PATCH] restorecon: use FLAG() macro for readability. --- toys/android/restorecon.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/toys/android/restorecon.c b/toys/android/restorecon.c index 39261fd9..0b8cdd0b 100644 --- a/toys/android/restorecon.c +++ b/toys/android/restorecon.c @@ -33,12 +33,11 @@ void restorecon_main(void) char **s; int flags = 0; - if (toys.optflags & FLAG_D) flags |= SELINUX_ANDROID_RESTORECON_DATADATA; - if (toys.optflags & FLAG_F) flags |= SELINUX_ANDROID_RESTORECON_FORCE; - if (toys.optflags & (FLAG_R|FLAG_r)) - flags |= SELINUX_ANDROID_RESTORECON_RECURSE; - if (toys.optflags & FLAG_n) flags |= SELINUX_ANDROID_RESTORECON_NOCHANGE; - if (toys.optflags & FLAG_v) flags |= SELINUX_ANDROID_RESTORECON_VERBOSE; + if (FLAG(D)) flags |= SELINUX_ANDROID_RESTORECON_DATADATA; + if (FLAG(F)) flags |= SELINUX_ANDROID_RESTORECON_FORCE; + if (FLAG(R) || FLAG(r)) flags |= SELINUX_ANDROID_RESTORECON_RECURSE; + if (FLAG(n)) flags |= SELINUX_ANDROID_RESTORECON_NOCHANGE; + if (FLAG(v)) flags |= SELINUX_ANDROID_RESTORECON_VERBOSE; for (s = toys.optargs; *s; s++) if (selinux_android_restorecon(*s, flags) < 0) -- 2.39.2