From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 15 Nov 2024 01:35:49 +0000 (-0800)
Subject: ls: refactor gobble_file get_scontext
X-Git-Tag: v9.6~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f0bf8d7c4b7131c6a8762de02ea01affef4db65;p=thirdparty%2Fcoreutils.git

ls: refactor gobble_file get_scontext

* src/ls.c (gobble_file): Simplify by pulling get_scontext
out of ‘if’.
---

diff --git a/src/ls.c b/src/ls.c
index 6422022d26..5003608b4d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -3496,12 +3496,12 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
   if (type == directory && command_line_arg && !immediate_dirs)
     f->filetype = type = arg_directory;
 
+  bool get_scontext = (format == long_format) | print_scontext;
   bool check_capability = format_needs_capability & (type == normal);
 
-  if ((format == long_format) | print_scontext | check_capability)
+  if (get_scontext | check_capability)
     {
       struct aclinfo ai;
-      bool get_scontext = (format == long_format) | print_scontext;
       int aclinfo_flags = ((do_deref ? ACL_SYMLINK_FOLLOW : 0)
                            | (get_scontext ? ACL_GET_SCONTEXT : 0)
                            | filetype_d_type[type]);