Fewer uses of uintmax_t in xheader.c

* src/tar.h (struct xheader):
* src/xheader.c (xheader_string_end):
Use idx_t, not uintmax_t, for string length.
* src/xheader.c (xheader_string_add):
Avoid duplicate calls to strlen.
(xheader_string_end): Remove by-hand check for size overflow;
it’s not possible, as this is measuring allocated storage.

diff --git a/src/tar.h b/src/tar.h
index caae9a13cda485efa57f5d2ad063ffaf4b13795c..dbd493f9b1d060a11cd72caf04e17a9191e6d5b6 100644 (file)
--- a/src/tar.h
+++ b/src/tar.h
@@ -289,7 +289,7 @@ struct xheader
   struct obstack *stk;
   idx_t size;
   char *buffer;
-  uintmax_t string_length;
+  idx_t string_length;
 };
 
 /* Information about xattrs for a file.  */

diff --git a/src/xheader.c b/src/xheader.c
index 830740bf8f1a7784ed3c0e6fe13737cd59fc6a07..c5021fd8f1cbf44da7ee6af3578650a1ff73140b 100644 (file)
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -923,16 +923,16 @@ xheader_string_add (struct xheader *xhdr, char const *s)
   if (xhdr->buffer)
     return;
   xheader_init (xhdr);
-  xhdr->string_length += strlen (s);
-  x_obstack_grow (xhdr, s, strlen (s));
+  idx_t slen = strlen (s);
+  xhdr->string_length += slen;
+  x_obstack_grow (xhdr, s, slen);
 }
 
 bool
 xheader_string_end (struct xheader *xhdr, char const *keyword)
 {
-  uintmax_t len;
-  uintmax_t p;
-  uintmax_t n = 0;
+  idx_t p;
+  idx_t n = 0;
   char nbuf[UINTMAX_STRSIZE_BOUND];
   char const *np;
 
@@ -940,7 +940,7 @@ xheader_string_end (struct xheader *xhdr, char const *keyword)
     return false;
   xheader_init (xhdr);
 
-  len = strlen (keyword) + xhdr->string_length + 3; /* ' ' + '=' + '\n' */
+  idx_t len = strlen (keyword) + xhdr->string_length + (sizeof " =\n" - 1);
 
   do
     {
@@ -951,16 +951,6 @@ xheader_string_end (struct xheader *xhdr, char const *keyword)
   while (n != p);
 
   p = strlen (keyword) + n + 2;
-  idx_t size = p;
-  if (size != p)
-    {
-      paxerror (0,
-               _("Generated keyword/value pair is too long"
-                 " (keyword=%s, length=%s)"),
-               keyword, nbuf);
-      obstack_free (xhdr->stk, obstack_finish (xhdr->stk));
-      return false;
-    }
   x_obstack_blank (xhdr, p);
   x_obstack_1grow (xhdr, '\n');
   char *cp = obstack_next_free (xhdr->stk);