Omit a few minor unnecessary range checks

Based on Pip Cet’s review (Bug#36370#19).
* src/fileio.c (Fdo_auto_save):
* src/image.c (lookup_image):
* src/textprop.c (Fnext_single_char_property_change):
Prefer XFIXNUM to XFIXNAT for clarity and consistency with
neighboring code, and to avoid unnecessary range checks.
* src/image.c (lookup_image): Omit unnecessary range checks.

diff --git a/src/fileio.c b/src/fileio.c
index 61e10dac47fdee58ed7059174d8792d1d365c717..ed1d2aedf3799e4240c26d656ae5ff504a432043 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5852,7 +5852,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
                   spare the user annoying messages.  */
                && XFIXNUM (BVAR (b, save_length)) > 5000
                && (growth_factor * (BUF_Z (b) - BUF_BEG (b))
-                   < (growth_factor - 1) * XFIXNAT (BVAR (b, save_length)))
+                   < (growth_factor - 1) * XFIXNUM (BVAR (b, save_length)))
                /* These messages are frequent and annoying for `*mail*'.  */
                && !NILP (BVAR (b, filename))
                && NILP (no_message))

diff --git a/src/image.c b/src/image.c
index bbf25b4d58fb953268bd88561e0a196d511eb9f4..f3d6508f46013e0de49b9ee0ff4c4730b6ea8f0b 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -2385,18 +2385,18 @@ lookup_image (struct frame *f, Lisp_Object spec)
 #endif
 
          ascent = image_spec_value (spec, QCascent, NULL);
-         if (RANGED_FIXNUMP (0, ascent, INT_MAX))
-           img->ascent = XFIXNAT (ascent);
+         if (FIXNUMP (ascent))
+           img->ascent = XFIXNUM (ascent);
          else if (EQ (ascent, Qcenter))
            img->ascent = CENTERED_IMAGE_ASCENT;
 
          margin = image_spec_value (spec, QCmargin, NULL);
-         if (RANGED_FIXNUMP (0, margin, INT_MAX))
-           img->vmargin = img->hmargin = XFIXNAT (margin);
+         if (FIXNUMP (margin))
+           img->vmargin = img->hmargin = XFIXNUM (margin);
          else if (CONSP (margin))
            {
-             img->hmargin = XFIXNAT (XCAR (margin));
-             img->vmargin = XFIXNAT (XCDR (margin));
+             img->hmargin = XFIXNUM (XCAR (margin));
+             img->vmargin = XFIXNUM (XCDR (margin));
            }
 
          relief = image_spec_value (spec, QCrelief, NULL);

diff --git a/src/textprop.c b/src/textprop.c
index 3026ec7e992010e443cba514e00075231b7464e8..9023f4efa06c8500b47b8e623e59cec1d885929f 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -799,10 +799,10 @@ last valid position in OBJECT.  */)
       else
        CHECK_FIXNUM_COERCE_MARKER (limit);
 
-      if (XFIXNAT (position) >= XFIXNUM (limit))
+      if (XFIXNUM (position) >= XFIXNUM (limit))
        {
          position = limit;
-         if (XFIXNAT (position) > ZV)
+         if (XFIXNUM (position) > ZV)
            XSETFASTINT (position, ZV);
        }
       else