[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117985: * xterm.c (x_term_init): Allocate temps on
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117985: * xterm.c (x_term_init): Allocate temps on stack, not on heap. |
Date: |
Tue, 30 Sep 2014 15:31:22 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117985
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-09-30 08:31:18 -0700
message:
* xterm.c (x_term_init): Allocate temps on stack, not on heap.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-09-30 15:20:03 +0000
+++ b/src/ChangeLog 2014-09-30 15:31:18 +0000
@@ -1,5 +1,7 @@
2014-09-30 Paul Eggert <address@hidden>
+ * xterm.c (x_term_init): Allocate temps on stack, not on heap.
+
* frame.c (x_set_frame_parameters): Port --enable-gcc-warnings
to Ubuntu 14.04.1 x86-64.
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2014-09-30 02:43:23 +0000
+++ b/src/xterm.c 2014-09-30 15:31:18 +0000
@@ -11062,11 +11062,11 @@
};
int i;
- const int atom_count = ARRAYELTS (atom_refs);
- /* 1 for _XSETTINGS_SN */
- const int total_atom_count = 1 + atom_count;
- Atom *atoms_return = xmalloc (total_atom_count * sizeof *atoms_return);
- char **atom_names = xmalloc (total_atom_count * sizeof *atom_names);
+ enum { atom_count = ARRAYELTS (atom_refs) };
+ /* 1 for _XSETTINGS_SN. */
+ enum { total_atom_count = 1 + atom_count };
+ Atom atoms_return[total_atom_count];
+ char *atom_names[total_atom_count];
static char const xsettings_fmt[] = "_XSETTINGS_S%d";
char xsettings_atom_name[sizeof xsettings_fmt - 2
+ INT_STRLEN_BOUND (int)];
@@ -11074,7 +11074,7 @@
for (i = 0; i < atom_count; i++)
atom_names[i] = (char *) atom_refs[i].name;
- /* Build _XSETTINGS_SN atom name */
+ /* Build _XSETTINGS_SN atom name. */
sprintf (xsettings_atom_name, xsettings_fmt,
XScreenNumberOfScreen (dpyinfo->screen));
atom_names[i] = xsettings_atom_name;
@@ -11085,11 +11085,8 @@
for (i = 0; i < atom_count; i++)
*(Atom *) ((char *) dpyinfo + atom_refs[i].offset) = atoms_return[i];
- /* Manual copy of last atom */
+ /* Manually copy last atom. */
dpyinfo->Xatom_xsettings_sel = atoms_return[i];
-
- xfree (atom_names);
- xfree (atoms_return);
}
dpyinfo->x_dnd_atoms_size = 8;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117985: * xterm.c (x_term_init): Allocate temps on stack, not on heap.,
Paul Eggert <=