Simplify bignum->intmax conversion

* src/lisp.h (integer_to_intmax, integer_to_uintmax): New functions.
* src/data.c (cons_to_unsigned, cons_to_signed)
(arith_driver):
* src/dbusbind.c (xd_extract_signed, xd_extract_unsigned):
* src/dispnew.c (sit_for):
* src/editfns.c (styled_format):
* src/emacs-module.c (module_extract_integer):
* src/fileio.c (file_offset):
* src/font.c (font_unparse_xlfd, Fopen_font):
* src/xdisp.c (calc_line_height_property):
* src/process.c (handle_child_signal):

1 files changed, 7 insertions, 12 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 3b1c21a1781..4ea70253793 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4691,21 +4691,16 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
                         }
                       else
                         {
-                          if (FIXNUMP (arg))
-                            ldarg = XFIXNUM (arg);
-                          else
+                          if (INTEGERP (arg))
                             {
-                              intmax_t iarg = bignum_to_intmax (arg);
-                              if (iarg != 0)
+                              intmax_t iarg;
+                              uintmax_t uarg;
+                              if (integer_to_intmax (arg, &iarg))
                                 ldarg = iarg;
+                              else if (integer_to_uintmax (arg, &uarg))
+                                ldarg = uarg;
                               else
-                                {
-                                  uintmax_t uarg = bignum_to_uintmax (arg);
-                                  if (uarg != 0)
-                                    ldarg = uarg;
-                                  else
-                                    format_bignum_as_double = true;
-                                }
+                                format_bignum_as_double = true;
                             }
                           if (!format_bignum_as_double)
                             {