From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 27 Sep 2024 20:15:03 +0000 (-0700)
Subject: factor: print_uuint accepts uuint
X-Git-Tag: v9.6~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92902de118be3fe004615d727380e5425e53ee7b;p=thirdparty%2Fcoreutils.git

factor: print_uuint accepts uuint

* src/factor.c (print_uuint): Rename from print_uintmaxes
and accept a uuint rather than two uintmax_t values.
Alll uses changed.
---

diff --git a/src/factor.c b/src/factor.c
index 4bb4d4a53a..2a31ecc1c5 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -2391,9 +2391,9 @@ lbuf_putint (uintmax_t i, int min_width)
 }
 
 static void
-print_uintmaxes (uintmax_t t1, uintmax_t t0)
+print_uuint (uuint t)
 {
-  uintmax_t q, r;
+  uintmax_t t1 = hi (t), t0 = lo (t);
 
   if (t1 == 0)
     lbuf_putint (t0, 0);
@@ -2401,10 +2401,10 @@ print_uintmaxes (uintmax_t t1, uintmax_t t0)
     {
       /* Use very plain code here since it seems hard to write fast code
          without assuming a specific word size.  */
-      q = t1 / 1000000000;
-      r = t1 % 1000000000;
+      uintmax_t q = t1 / 1000000000;
+      uintmax_t r = t1 % 1000000000;
       udiv_qrnnd (t0, r, r, t0, 1000000000);
-      print_uintmaxes (q, t0);
+      print_uuint (make_uuint (q, t0));
       lbuf_putint (r, 9);
     }
 }
@@ -2442,7 +2442,7 @@ print_factors_single (uintmax_t t1, uintmax_t t0)
 {
   struct factors factors;
 
-  print_uintmaxes (t1, t0);
+  print_uuint (make_uuint (t1, t0));
   lbuf_putc (':');
 
   factor (t1, t0, &factors);
@@ -2451,7 +2451,7 @@ print_factors_single (uintmax_t t1, uintmax_t t0)
     for (int k = 0; k < factors.e[j]; k++)
       {
         lbuf_putc (' ');
-        print_uintmaxes (0, factors.p[j]);
+        print_uuint (make_uuint (0, factors.p[j]));
         if (print_exponents && factors.e[j] > 1)
           {
             lbuf_putc ('^');
@@ -2463,7 +2463,7 @@ print_factors_single (uintmax_t t1, uintmax_t t0)
   if (hi (factors.plarge))
     {
       lbuf_putc (' ');
-      print_uintmaxes (hi (factors.plarge), lo (factors.plarge));
+      print_uuint (factors.plarge);
     }
 
   lbuf_putnl ();