From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 2 Nov 2024 06:24:46 +0000 (-0700)
Subject: Prefer other types to int in transform.c
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f4ac66226a745cb8c14a7ce01e5e06deb037c199;p=thirdparty%2Ftar.git

Prefer other types to int in transform.c

* src/transform.c (add_char_segment, parse_xform_flags)
(parse_transform_expr): Prefer char for char.
(parse_transform_expr): Don’t assume strlen (expr) <= INT_MAX.
---

diff --git a/src/transform.c b/src/transform.c
index adef4795..cda12f46 100644
--- a/src/transform.c
+++ b/src/transform.c
@@ -116,7 +116,7 @@ add_literal_segment (struct transform *tf, const char *str, const char *end)
 }
 
 static void
-add_char_segment (struct transform *tf, int chr)
+add_char_segment (struct transform *tf, char chr)
 {
   struct replace_segm *segm = add_segment (tf);
   segm->type = segm_literal;
@@ -135,7 +135,7 @@ add_backref_segment (struct transform *tf, idx_t ref)
 }
 
 static bool
-parse_xform_flags (int *pflags, int c)
+parse_xform_flags (int *pflags, char c)
 {
   switch (c)
     {
@@ -180,8 +180,7 @@ add_case_ctl_segment (struct transform *tf, enum case_ctl_type ctl)
 static const char *
 parse_transform_expr (const char *expr)
 {
-  int delim;
-  int i, j, rc;
+  idx_t i, j;
   char *str, *beg, *cur;
   const char *p;
   int cflags = 0;
@@ -207,7 +206,7 @@ parse_transform_expr (const char *expr)
       paxusage (_("Invalid transform expression"));
     }
 
-  delim = expr[1];
+  char delim = expr[1];
   if (!delim)
     paxusage (_("Invalid transform expression"));
 
@@ -267,7 +266,7 @@ parse_transform_expr (const char *expr)
   memcpy (str, expr + 2, i - 2);
   str[i - 2] = 0;
 
-  rc = regcomp (&tf->regex, str, cflags);
+  int rc = regcomp (&tf->regex, str, cflags);
 
   if (rc)
     {