grep: simplify by using PRIuMAX

* configure.ac (HAVE_PRINTF_C99_SIZES): Remove; no longer needed.
* src/grep.c (print_offset): Simplify (Bug#24451).

2 files changed, 1 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 0dd4d849..8a20317e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,12 +206,6 @@ fi
 
 gl_FUNC_PCRE
 
-gl_PRINTF_SIZES_C99
-if test "$gl_cv_func_printf_sizes_c99" = yes; then
-  AC_DEFINE([HAVE_PRINTF_C99_SIZES], [1],
-    [Define to 1 if printf formats %j, %z, %t and %L work.])
-fi
-
 case $host_os in
   mingw*) suffix=w32 ;;
   *) suffix=posix ;;
diff --git a/src/grep.c b/src/grep.c
index 62866cbd..f120bcfd 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -1084,32 +1084,8 @@ print_sep (char sep)
 static void
 print_offset (uintmax_t pos, const char *color)
 {
-#if !HAVE_PRINTF_C99_SIZES
-  /* Do not rely on printf to print pos, since uintmax_t may be longer
-     than long, and long long is not portable.  */
-
-  int min_width = offset_width;
-  char buf[sizeof pos * CHAR_BIT];
-  char *p = buf + sizeof buf;
-
-  do
-    {
-      *--p = '0' + pos % 10;
-      --min_width;
-    }
-  while ((pos /= 10) != 0);
-
-  /* Do this to maximize the probability of alignment across lines.  */
-  while (--min_width >= 0)
-    *--p = ' ';
-#endif /* !HAVE_PRINTF_C99_SIZES */
-
   pr_sgr_start_if (color);
-#if HAVE_PRINTF_C99_SIZES
-  printf_errno ("%*ju", offset_width, pos);
-#else
-  fwrite_errno (p, 1, buf + sizeof buf - p);
-#endif
+  printf_errno ("%*"PRIuMAX, offset_width, pos);
   pr_sgr_end_if (color);
 }