Use idx_t, not size_t, for xattr value lengths.

* src/tar.h (struct xattr_map):
* src/xattrs.c (xattr_map_add): Prefer idx_t to size_t.  All uses
changed.

diff --git a/src/common.h b/src/common.h
index 8fdd88dc91c67f4232d9c6cd1cd61fd08f820b20..737bf1540d1032d9d0b4e2e27a179b1039dbeb47 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -915,7 +915,7 @@ void xattr_map_init (struct xattr_map *map);
 void xattr_map_copy (struct xattr_map *dst,
                     const struct xattr_map *src);
 void xattr_map_add (struct xattr_map *map,
-                   const char *key, const char *val, size_t len);
+                   const char *key, const char *val, idx_t len);
 void xattr_map_free (struct xattr_map *xattr_map);
 
 /* Module system.c */

diff --git a/src/tar.h b/src/tar.h
index f53ef3e7294c6b01b3da91ed31fb5b7f40c19e73..5aed22cf5d1a41f8402ac0979dd65095a322f921 100644 (file)
--- a/src/tar.h
+++ b/src/tar.h
@@ -281,7 +281,7 @@ struct xattr_array
   {
     char *xkey;
     char *xval_ptr;
-    size_t xval_len;
+    idx_t xval_len;
   };
 
 struct xattr_map

diff --git a/src/xattrs.c b/src/xattrs.c
index c8a6588bcd2a2974a88faf68a116f2ad1e495f13..dc22269aa20700fbb0de01992c4d3b2d69835e24 100644 (file)
--- a/src/xattrs.c
+++ b/src/xattrs.c
@@ -66,7 +66,7 @@ xattr_map_free (struct xattr_map *xattr_map)
 
 void
 xattr_map_add (struct xattr_map *map,
-              const char *key, const char *val, size_t len)
+              const char *key, const char *val, idx_t len)
 {
   struct xattr_array *p;
 
@@ -75,7 +75,7 @@ xattr_map_add (struct xattr_map *map,
                              sizeof (map->xm_map[0]));
   p = &map->xm_map[map->xm_size];
   p->xkey = xstrdup (key);
-  p->xval_ptr = xmemdup (val, len + 1);
+  p->xval_ptr = ximemdup (val, len + 1);
   p->xval_len = len;
   map->xm_size++;
 }
@@ -854,8 +854,8 @@ xattrs_print (struct tar_stat_info const *st)
         {
           char *keyword = st->xattr_map.xm_map[i].xkey + XATTRS_PREFIX_LEN;
           if (!xattrs_masked_out (keyword, false /* like extracting */ ))
-           fprintf (stdlis, "  x: %lu %s\n",
-                    (unsigned long) st->xattr_map.xm_map[i].xval_len, keyword);
+           fprintf (stdlis, "  x: %td %s\n",
+                    st->xattr_map.xm_map[i].xval_len, keyword);
         }
     }
 }