[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 877be9098e 02/11: Pacify GCC 12 -fanalyzer in x_popup_menu_1
From: |
Paul Eggert |
Subject: |
master 877be9098e 02/11: Pacify GCC 12 -fanalyzer in x_popup_menu_1 |
Date: |
Tue, 31 May 2022 04:26:57 -0400 (EDT) |
branch: master
commit 877be9098ee3ecc041216d39dbb20d0d044a46c0
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Pacify GCC 12 -fanalyzer in x_popup_menu_1
* src/menu.c (x_popup_menu_1): Rework to avoid unnecessary
initialization and test. This also pacifies GCC 12.
---
src/menu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/menu.c b/src/menu.c
index 398bf9329f..eeb0c9a7e5 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1118,7 +1118,7 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
Lisp_Object title;
const char *error_name = NULL;
Lisp_Object selection = Qnil;
- struct frame *f = NULL;
+ struct frame *f;
Lisp_Object x, y, window;
int menuflags = 0;
specpdl_ref specpdl_count = SPECPDL_INDEX ();
@@ -1269,9 +1269,9 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
}
}
else
- /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
+ /* ??? Not really clean; should be Qwindow_or_framep
but I don't want to make one now. */
- CHECK_WINDOW (window);
+ wrong_type_argument (Qwindowp, window);
xpos += check_integer_range (x,
(xpos < INT_MIN - MOST_NEGATIVE_FIXNUM
- master updated (d94890404e -> a55a0483c9), Paul Eggert, 2022/05/31
- master 1f6973241a 07/11: Pacify GCC 12 in Fx_show_tip, Paul Eggert, 2022/05/31
- master a1c19dfca4 01/11: Pacify GCC 12 -Wanalyzer-use-of-uninitialized-value, Paul Eggert, 2022/05/31
- master c4da5db04b 08/11: Pacify GCC 12 in Fmove_overlay, Paul Eggert, 2022/05/31
- master 82c05c034e 03/11: Avoid undefined behavior in detect_coding routines, Paul Eggert, 2022/05/31
- master 877be9098e 02/11: Pacify GCC 12 -fanalyzer in x_popup_menu_1,
Paul Eggert <=
- master 0614e0f3e9 10/11: Pacify GCC 12 in dump_queue_enqueue, Paul Eggert, 2022/05/31
- master 13dac6f3e9 05/11: Pacify GCC 12 false positive in ccl.c, Paul Eggert, 2022/05/31
- master 569d4c7ad6 09/11: Be more robust if doc file is corrupted, Paul Eggert, 2022/05/31
- master a55a0483c9 11/11: Pacify GCC 12 in x_get_current_wm_state, Paul Eggert, 2022/05/31
- master 30966a6e67 04/11: Simplify CHAR_TABLE_REF_ASCII, Paul Eggert, 2022/05/31
- master 920f1e68b8 06/11: Pacify GCC 12 in xrdb.c, Paul Eggert, 2022/05/31