Prefer the 'min'/'max' macros where possible

* src/composite.c (find_automatic_composition):
* src/lisp.h (clip_to_bounds):
* src/pgtkfns.c (PATH_MAX_LEN):
* src/profiler.c (approximate_median):
* src/unexmacosx.c (unexec_write_zero, unexec_copy, unexec_realloc):
* src/xdisp.c (get_nearby_bol_pos): Prefer the 'min' and 'max' macros.

(cherry picked from commit c37aa3df9d84325924a7a163271154447dfc0cfd)

diff --git a/src/composite.c b/src/composite.c
index f857dbf77ee241c7a2de29101219d8ea50f07559..2ef72a33d2e1793ee70bd46da3ad6923d1735774 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1676,7 +1676,7 @@ find_automatic_composition (ptrdiff_t pos, ptrdiff_t limit, ptrdiff_t backlim,
     }
   else
     {
-      head = backlim < 0 ? 0 : backlim, tail = SCHARS (string), stop = -1;
+      head = max (backlim, 0), tail = SCHARS (string), stop = -1;
       cur.pos_byte = string_char_to_byte (string, cur.pos);
       cur.p = SDATA (string) + cur.pos_byte;
     }

diff --git a/src/lisp.h b/src/lisp.h
index c9f9f17e0dba6a66b7e9be7b08d2631a67044462..d0354d836299700d368a85eb9715965e08248d0a 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1362,7 +1362,7 @@ EQ (Lisp_Object x, Lisp_Object y)
 INLINE intmax_t
 clip_to_bounds (intmax_t lower, intmax_t num, intmax_t upper)
 {
-  return num < lower ? lower : num <= upper ? num : upper;
+  return num < lower ? lower : min (num, upper);
 }
 \f
 /* Construct a Lisp_Object from a value or address.  */

diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 9251e137f09b81d0622fdc4d26c8736fe2f58b61..21456f4f489798a9c07ec18332ccaf57ab9feb3e 100644 (file)
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -1782,8 +1782,7 @@ Some window managers may refuse to restack windows.  */)
 #define PATH_FOR_CLASS_TYPE "/org/gnu/emacs/defaults-by-class/"
 #define PATH_PREFIX_FOR_NAME_TYPE "/org/gnu/emacs/defaults-by-name/"
 #define PATH_MAX_LEN \
-  (sizeof PATH_FOR_CLASS_TYPE > sizeof PATH_PREFIX_FOR_NAME_TYPE ? \
-   sizeof PATH_FOR_CLASS_TYPE : sizeof PATH_PREFIX_FOR_NAME_TYPE)
+  (max (sizeof PATH_FOR_CLASS_TYPE, sizeof PATH_PREFIX_FOR_NAME_TYPE))
 
 static inline int
 pgtk_is_lower_char (int c)

diff --git a/src/profiler.c b/src/profiler.c
index 4c88f676fbd04a50a6af7d1f042a0e37babf881d..03e8d007e9fab4498796d8a18421561f79050941 100644 (file)
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -238,8 +238,8 @@ approximate_median (log_t *log, int start, int size)
       EMACS_INT i3 = approximate_median (log, start2 + newsize,
                                         size - 2 * newsize);
       return (i1 < i2
-             ? (i2 < i3 ? i2 : (i1 < i3 ? i3 : i1))
-             : (i1 < i3 ? i1 : (i2 < i3 ? i3 : i2)));
+             ? (i2 < i3 ? i2 : max (i1, i3))
+             : (i1 < i3 ? i1 : max (i2, i3)));
     }
 }
 

diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index f453f8ea7bb0f16aa9f74548f494c86cd5e9dd85..10524224711ec2325a61aecb4f07c981428f7727 100644 (file)
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -250,7 +250,7 @@ unexec_write_zero (off_t dest, size_t count)
 
   while (count > 0)
     {
-      bytes = count > UNEXEC_COPY_BUFSZ ? UNEXEC_COPY_BUFSZ : count;
+      bytes = min (count, UNEXEC_COPY_BUFSZ);
       if (write (outfd, buf, bytes) != bytes)
        return 0;
       count -= bytes;
@@ -278,7 +278,7 @@ unexec_copy (off_t dest, off_t src, ssize_t count)
 
   while (count > 0)
     {
-      bytes_to_read = count > UNEXEC_COPY_BUFSZ ? UNEXEC_COPY_BUFSZ : count;
+      bytes_to_read = min (count, UNEXEC_COPY_BUFSZ);
       bytes_read = read (infd, buf, bytes_to_read);
       if (bytes_read <= 0)
        return 0;
@@ -1355,7 +1355,7 @@ unexec_realloc (void *old_ptr, size_t new_size)
       if (ptr_in_unexec_regions (old_ptr))
        {
          size_t old_size = ((unexec_malloc_header_t *) old_ptr)[-1].u.size;
-         size_t size = new_size > old_size ? old_size : new_size;
+         size_t size = min (new_size, old_size);
 
          p = malloc (new_size);
          if (size)

diff --git a/src/xdisp.c b/src/xdisp.c
index f464ed6948c8e1d6a944a9b3488809aec599701b..830c1e3b95a3b85a361872a9c40dacec8d9a3976 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3670,7 +3670,7 @@ get_nearby_bol_pos (ptrdiff_t pos)
   for (dist = 500; dist <= 500000; dist *= 10)
     {
       pos_bytepos = pos == BEGV ? BEGV_BYTE : CHAR_TO_BYTE (pos);
-      start = pos - dist < BEGV ? BEGV : pos - dist;
+      start = max (pos - dist, BEGV);
       for (cur = start; cur < pos; cur = next)
        {
          next = find_newline1 (cur, CHAR_TO_BYTE (cur),
@@ -3684,7 +3684,7 @@ get_nearby_bol_pos (ptrdiff_t pos)
       if (bol >= BEGV || start == BEGV)
        break;
       else
-       pos = pos - dist < BEGV ? BEGV : pos - dist;
+       pos = max (pos - dist, BEGV);
     }
   eassert (bol <= init_pos);
   return bol;