emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 750dbccc124 08/11: Pacify GCC 14 -Wnull-dereference in intervals.


From: Paul Eggert
Subject: master 750dbccc124 08/11: Pacify GCC 14 -Wnull-dereference in intervals.c
Date: Tue, 30 Apr 2024 04:26:38 -0400 (EDT)

branch: master
commit 750dbccc12415fe525111cd11811d809fc830610
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Pacify GCC 14 -Wnull-dereference in intervals.c
    
    * src/intervals.c (set_intervals_multibyte_1):
    Add an eassume to pacify GCC.  Deparenthesisze.
---
 src/intervals.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/intervals.c b/src/intervals.c
index 2ab19c2cc56..c7a1f81e4ee 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2388,17 +2388,18 @@ set_intervals_multibyte_1 (INTERVAL i, bool multi_flag,
      to this interval.  */
   if (LEFT_TOTAL_LENGTH (i) + RIGHT_TOTAL_LENGTH (i) >= TOTAL_LENGTH (i))
     {
-      if ((i)->left)
+      if (i->left)
        {
          set_interval_plist (i, i->left->plist);
-         (i)->left->total_length = 0;
+         i->left->total_length = 0;
          delete_interval ((i)->left);
        }
       else
        {
+         eassume (i->right);
          set_interval_plist (i, i->right->plist);
-         (i)->right->total_length = 0;
-         delete_interval ((i)->right);
+         i->right->total_length = 0;
+         delete_interval (i->right);
        }
     }
 }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]