Prefer other types to int in xattrs.c

* src/xattrs.c (xattrs__acls_set) [HAVE_POSIX_ACLS]:
Prefer acl_type_t to int for ACL types.
(acls_get_text, xattrs_acls_get, xattrs_acls_set)
(xattrs_xattrs_get, xattrs_selinux_get, xattrs_selinux_set)
(xattrs_xattrs_set): Prefer bool for booleans.

diff --git a/src/extract.c b/src/extract.c
index 4c45704c9a7c76203f8df069061c06829bbfbb89..f741943f19f7297fc1a3f935b4aeb534e1e77ac9 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -456,7 +456,7 @@ set_stat (char const *file_name,
 
   /* these three calls must be done *after* fd_chown() call because fd_chown
      causes that linux capabilities becomes cleared. */
-  xattrs_xattrs_set (st, file_name, typeflag, 1);
+  xattrs_xattrs_set (st, file_name, typeflag, true);
   xattrs_acls_set (st, file_name, typeflag);
   xattrs_selinux_set (st, file_name, typeflag);
 }
@@ -943,7 +943,7 @@ set_xattr (char const *file_name, struct tar_stat_info const *st,
       int r = mknodat (chdir_fd, file_name, mode, 0);
       if (r < 0)
        return r;
-      xattrs_xattrs_set (st, file_name, typeflag, 0);
+      xattrs_xattrs_set (st, file_name, typeflag, false);
       return 1;
     }
 #endif

diff --git a/src/xattrs.c b/src/xattrs.c
index 1cee78de501a70d12bce60e559140219fc8c6cec..7c450ae72aec3cb6e94078be90647d35073f84e1 100644 (file)
--- a/src/xattrs.c
+++ b/src/xattrs.c
@@ -278,7 +278,7 @@ fixup_extra_acl_fields (char *ptr)
    attribute.  Called only when acls_option > 0. */
 static void
 xattrs__acls_set (struct tar_stat_info const *st,
-                  char const *file_name, int type,
+                 char const *file_name, acl_type_t type,
                  char *ptr, bool def)
 {
   acl_t acl;
@@ -362,12 +362,12 @@ acls_get_text (int parentfd, const char *file_name, acl_type_t type,
       val = acl_to_any_text (acl, NULL, '\n',
                             TEXT_SOME_EFFECTIVE | TEXT_NUMERIC_IDS);
 #else
-      static int warned;
+      static bool warned;
       if (!warned)
        {
+         warned = true;
          paxwarn (0, _("--numeric-owner is ignored for ACLs:"
                        " libacl is not available"));
-         warned = 1;
        }
 #endif
     }
@@ -442,15 +442,17 @@ acls_one_line (const char *prefix, char delim,
 void
 xattrs_acls_get (MAYBE_UNUSED int parentfd, MAYBE_UNUSED char const *file_name,
                 MAYBE_UNUSED struct tar_stat_info *st,
-                MAYBE_UNUSED int xisfile)
+                MAYBE_UNUSED bool xisfile)
 {
   if (acls_option > 0)
     {
 #ifndef HAVE_POSIX_ACLS
-      static int done = 0;
+      static bool done;
       if (!done)
-       paxwarn (0, _("POSIX ACL support is not available"));
-      done = 1;
+       {
+         done = true;
+         paxwarn (0, _("POSIX ACL support is not available"));
+       }
 #else
       int err = file_has_acl_at (parentfd, file_name, &st->stat);
       if (err == 0)
@@ -477,10 +479,12 @@ xattrs_acls_set (MAYBE_UNUSED struct tar_stat_info const *st,
   if (acls_option > 0 && typeflag != SYMTYPE)
     {
 #ifndef HAVE_POSIX_ACLS
-      static int done = 0;
+      static bool done;
       if (!done)
-       paxwarn (0, _("POSIX ACL support is not available"));
-      done = 1;
+       {
+         done = true;
+         paxwarn (0, _("POSIX ACL support is not available"));
+       }
 #else
       xattrs__acls_set (st, file_name, ACL_TYPE_ACCESS,
                        st->acls_a_ptr, false);
@@ -523,10 +527,12 @@ xattrs_xattrs_get (int parentfd, char const *file_name,
   if (xattrs_option)
     {
 #ifndef HAVE_XATTRS
-      static int done = 0;
+      static bool done;
       if (!done)
-       paxwarn (0, _("XATTR support is not available"));
-      done = 1;
+       {
+         done = true;
+         paxwarn (0, _("XATTR support is not available"));
+       }
 #else
       static idx_t xsz = 1024 / 2 * 3;
       static char *xatrs = NULL;
@@ -618,10 +624,12 @@ xattrs_selinux_get (MAYBE_UNUSED int parentfd, MAYBE_UNUSED char const *file_nam
   if (selinux_context_option > 0)
     {
 #if HAVE_SELINUX_SELINUX_H != 1
-      static int done = 0;
+      static bool done;
       if (!done)
-       paxwarn (0, _("SELinux support is not available"));
-      done = 1;
+       {
+         done = true;
+         paxwarn (0, _("SELinux support is not available"));
+       }
 #else
       int result = (fd
                    ? fgetfilecon (fd, &st->cntx_name)
@@ -640,10 +648,12 @@ xattrs_selinux_set (MAYBE_UNUSED struct tar_stat_info const *st,
   if (selinux_context_option > 0)
     {
 #if HAVE_SELINUX_SELINUX_H != 1
-      static int done = 0;
+      static bool done;
       if (!done)
-       paxwarn (0, _("SELinux support is not available"));
-      done = 1;
+       {
+         done = true;
+         paxwarn (0, _("SELinux support is not available"));
+       }
 #else
       const char *sysname = "setfilecon";
       int ret;
@@ -713,15 +723,17 @@ xattrs_masked_out (const char *kw, bool archiving)
 
 void
 xattrs_xattrs_set (struct tar_stat_info const *st,
-                   char const *file_name, char typeflag, int later_run)
+                   char const *file_name, char typeflag, bool later_run)
 {
   if (xattrs_option)
     {
 #ifndef HAVE_XATTRS
-      static int done = 0;
+      static bool done;
       if (!done)
-       paxwarn (0, _("XATTR support is not available"));
-      done = 1;
+       {
+         done = true;
+         paxwarn (0, _("XATTR support is not available"));
+       }
 #else
       if (!st->xattr_map.xm_size)
         return;

diff --git a/src/xattrs.h b/src/xattrs.h
index 8ce7b661652afc3355c87467d20e0c395e252e45..13b05311a7f0ef2949df60b87d7e165200db2618 100644 (file)
--- a/src/xattrs.h
+++ b/src/xattrs.h
@@ -27,7 +27,7 @@
 extern void xattrs_mask_add (const char *mask, bool incl);
 
 extern void xattrs_acls_get (int parentfd, char const *file_name,
-                            struct tar_stat_info *st, int xisfile);
+                            struct tar_stat_info *st, bool xisfile);
 extern void xattrs_selinux_get (int parentfd, char const *file_name,
                                 struct tar_stat_info *st, int fd);
 extern void xattrs_xattrs_get (int parentfd, char const *file_name,
@@ -39,7 +39,7 @@ extern void xattrs_selinux_set (struct tar_stat_info const *st,
                                 char const *file_name, char typeflag);
 extern void xattrs_xattrs_set (struct tar_stat_info const *st,
                                char const *file_name, char typeflag,
-                               int later_run);
+                               bool later_run);
 
 extern void xattrs_print_char (struct tar_stat_info const *st, char *output);
 extern void xattrs_print (struct tar_stat_info const *st);