mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-12 01:01:51 -07:00
Code Issues Projects Releases Wiki Activity

Replace more uses of igc_xzalloc_ambig with IGC_XZALLOC_AMBIG.

Browse source 
* src/androidterm.c:
* src/gnutls.c:
* src/macfont.m
* src/pgtkfns.c:
* src/pgtkterm.c:
* src/sfntfont.c:
* src/xfns.c: Use IGC_XZALLOC_AMBIG instead of igc_xzalloc_ambig.
This commit is contained in:
Helmut Eller 2026-03-23 08:35:12 +01:00
parent b46129b647
commit ff9f5db283
7 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/androidterm.c
View file

@ -6787,7 +6787,7 @@ android_term_init (void)
Lisp_Object color_file;
#ifdef HAVE_MPS
dpyinfo = igc_xzalloc_ambig (sizeof *dpyinfo);
dpyinfo = IGC_XZALLOC_AMBIG (sizeof *dpyinfo);
#else
dpyinfo = xzalloc (sizeof *dpyinfo);
#endif

2
src/gnutls.c
View file

@ -709,7 +709,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
#ifdef HAVE_MPS
/* FIXME/igc: use exact tracing here */
if (!proc->gnutls_pproc)
proc->gnutls_pproc = igc_xzalloc_ambig (sizeof *proc->gnutls_pproc);
proc->gnutls_pproc = IGC_XZALLOC_AMBIG (sizeof *proc->gnutls_pproc);
#else
if (!proc->gnutls_pproc)
proc->gnutls_pproc = xmalloc (sizeof *proc->gnutls_pproc);

2
src/macfont.m
View file

@ -1886,7 +1886,7 @@ static struct OpenTypeSpec *
macfont_get_open_type_spec (Lisp_Object otf_spec)
{
#ifdef HAVE_MPS
struct OpenTypeSpec *spec = igc_xzalloc_ambig (sizeof *spec);
struct OpenTypeSpec *spec = IGC_XZALLOC_AMBIG (sizeof *spec);
#else
struct OpenTypeSpec *spec = xmalloc (sizeof *spec);
#endif

5
src/pgtkfns.c
View file

@ -1307,8 +1307,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, 1, 1, 0,
f->output_method = output_pgtk;
#ifdef HAVE_MPS
FRAME_X_OUTPUT (f)
= igc_xzalloc_ambig_with_label (sizeof *FRAME_X_OUTPUT (f),
"pgtk_output");
= igc_xzalloc_ambig (sizeof *FRAME_X_OUTPUT (f), "pgtk_output");
#else
FRAME_X_OUTPUT (f) = xzalloc (sizeof *FRAME_X_OUTPUT (f));
#endif
@ -2636,7 +2635,7 @@ pgtk_create_tip_frame (struct pgtk_display_info *dpyinfo, Lisp_Object parms, str
counts etc. */
f->output_method = output_pgtk;
#ifdef HAVE_MPS
f->output_data.pgtk = igc_xzalloc_ambig (sizeof *f->output_data.pgtk);
f->output_data.pgtk = IGC_XZALLOC_AMBIG (sizeof *f->output_data.pgtk);
#else
f->output_data.pgtk = xzalloc (sizeof *f->output_data.pgtk);
#endif

13
src/pgtkterm.c
View file

@ -185,8 +185,7 @@ pgtk_enumerate_devices (struct pgtk_display_info *dpyinfo,
for (t1 = devices_on_seat; t1; t1 = t1->next)
{
#ifdef HAVE_MPS
rec = igc_xzalloc_ambig_with_label (sizeof *rec,
"pgtk_device_t");
rec = igc_xzalloc_ambig (sizeof *rec, "pgtk_device_t");
#else
rec = xmalloc (sizeof *rec);
#endif
@ -307,9 +306,8 @@ evq_enqueue (union buffered_input_event *ev)
{
evq->cap = 4;
#ifdef HAVE_MPS
evq->q
= igc_xzalloc_ambig_with_label (sizeof *evq->q * evq->cap,
"buffered_input_event");
evq->q = igc_xzalloc_ambig (sizeof *evq->q * evq->cap,
"buffered_input_event");
#else
evq->q = xmalloc (sizeof *evq->q * evq->cap);
#endif
@ -6591,7 +6589,7 @@ pgtk_link_touch_point (struct pgtk_display_info *dpyinfo,
local_detail = 0;
#ifdef HAVE_MPS
touchpoint = igc_xzalloc_ambig (sizeof *touchpoint);
touchpoint = IGC_XZALLOC_AMBIG (sizeof *touchpoint);
#else
touchpoint = xmalloc (sizeof *touchpoint);
#endif
@ -7171,8 +7169,7 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
#ifdef HAVE_MPS
// FIXME/igc: use exact references
dpyinfo = igc_xzalloc_ambig_with_label (sizeof *dpyinfo,
"pgtk_display_info");
dpyinfo = igc_xzalloc_ambig (sizeof *dpyinfo, "pgtk_display_info");
#else
dpyinfo = xzalloc (sizeof *dpyinfo);
#endif

4
src/sfntfont.c
View file

@ -992,7 +992,7 @@ sfnt_enum_font_1 (int fd, const char *file,
/* Create the font desc and copy in the file name. */
#ifdef HAVE_MPS
desc = igc_xzalloc_ambig (sizeof *desc + strlen (file) + 1);
desc = IGC_XZALLOC_AMBIG (sizeof *desc + strlen (file) + 1);
#else
desc = xzalloc (sizeof *desc + strlen (file) + 1);
#endif
@ -3235,7 +3235,7 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity,
font implementation utilizes internal pointers
(font_info->outline_cache.next, for example). When the font object
moves, those pointers become invalid and we infloop. */
struct sfnt_font_info **leak = igc_xzalloc_ambig (sizeof *leak);
struct sfnt_font_info **leak = IGC_XZALLOC_AMBIG (sizeof *leak);
*leak = font_info;
#endif

2
src/xfns.c
View file

@ -4225,7 +4225,7 @@ x_window (struct frame *f, long window_prompting)
struct frame **framep;
#ifdef HAVE_MPS
framep = igc_xzalloc_ambig (sizeof *framep);
framep = IGC_XZALLOC_AMBIG (sizeof *framep);
#else
framep = xmalloc (sizeof *framep);
#endif