diff options
| author | Paul Eggert | 2012-07-05 11:35:48 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-05 11:35:48 -0700 |
| commit | 38182d901d030c7d65f4aa7a49b583afb30eb9b7 (patch) | |
| tree | a69e1a571495d6ca1c034359d7c995639774ab9b /src/keymap.c | |
| parent | 6dd5a677dbf794eedaa8325c46d57ac041373361 (diff) | |
| download | emacs-38182d901d030c7d65f4aa7a49b583afb30eb9b7.tar.gz emacs-38182d901d030c7d65f4aa7a49b583afb30eb9b7.zip | |
More xmalloc and related cleanup.
* alloc.c, bidi.c, buffer.c, buffer.h, bytecode.c, callint.c:
* callproc.c, charset.c, coding.c, composite.c, data.c, dispnew.c:
* doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, fns.c:
* font.c, fontset.c, frame.c, fringe.c, ftfont.c, ftxfont.c, gmalloc.c:
* gtkutil.c, image.c, keyboard.c, keymap.c, lread.c, macros.c, menu.c:
* nsfns.m, nsfont.m, nsmenu.m, nsterm.m, print.c, process.c, ralloc.c:
* regex.c, region-cache.c, scroll.c, search.c, sound.c, syntax.c:
* sysdep.c, term.c, termcap.c, unexmacosx.c, window.c, xdisp.c:
* xfaces.c, xfns.c, xftfont.c, xgselect.c, xmenu.c, xrdb.c, xselect.c:
* xterm.c:
Omit needless casts involving void * pointers and allocation.
Prefer "P = xmalloc (sizeof *P)" to "P = xmalloc (sizeof (TYPE_OF_P))",
as the former is more robust if P's type is changed.
Prefer xzalloc to xmalloc + memset 0.
Simplify malloc-or-realloc to realloc.
Don't worry about xmalloc returning a null pointer.
Prefer xstrdup to xmalloc + strcpy.
* editfns.c (Fmessage_box): Grow message_text by at least 80 when
growing it.
* keyboard.c (apply_modifiers_uncached): Prefer local array to
alloca of a constant.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index db4d5d12ee4..234740721ae 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1478,7 +1478,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) | |||
| 1478 | /* Use malloc here. See the comment above this function. | 1478 | /* Use malloc here. See the comment above this function. |
| 1479 | Avoid realloc here; it causes spurious traps on GNU/Linux [KFS] */ | 1479 | Avoid realloc here; it causes spurious traps on GNU/Linux [KFS] */ |
| 1480 | BLOCK_INPUT; | 1480 | BLOCK_INPUT; |
| 1481 | newmodes = (Lisp_Object *) malloc (allocsize); | 1481 | newmodes = malloc (allocsize); |
| 1482 | if (newmodes) | 1482 | if (newmodes) |
| 1483 | { | 1483 | { |
| 1484 | if (cmm_modes) | 1484 | if (cmm_modes) |
| @@ -1490,7 +1490,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) | |||
| 1490 | cmm_modes = newmodes; | 1490 | cmm_modes = newmodes; |
| 1491 | } | 1491 | } |
| 1492 | 1492 | ||
| 1493 | newmaps = (Lisp_Object *) malloc (allocsize); | 1493 | newmaps = malloc (allocsize); |
| 1494 | if (newmaps) | 1494 | if (newmaps) |
| 1495 | { | 1495 | { |
| 1496 | if (cmm_maps) | 1496 | if (cmm_maps) |
| @@ -2923,7 +2923,7 @@ You type Translation\n\ | |||
| 2923 | if (!SYMBOLP (modes[i])) | 2923 | if (!SYMBOLP (modes[i])) |
| 2924 | abort (); | 2924 | abort (); |
| 2925 | 2925 | ||
| 2926 | p = title = (char *) alloca (42 + SCHARS (SYMBOL_NAME (modes[i]))); | 2926 | p = title = alloca (42 + SCHARS (SYMBOL_NAME (modes[i]))); |
| 2927 | *p++ = '\f'; | 2927 | *p++ = '\f'; |
| 2928 | *p++ = '\n'; | 2928 | *p++ = '\n'; |
| 2929 | *p++ = '`'; | 2929 | *p++ = '`'; |