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/termcap.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/termcap.c')
| -rw-r--r-- | src/termcap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/termcap.c b/src/termcap.c index ea096d789da..d1b05e8df94 100644 --- a/src/termcap.c +++ b/src/termcap.c | |||
| @@ -478,7 +478,7 @@ tgetent (char *bp, const char *name) | |||
| 478 | { | 478 | { |
| 479 | ptrdiff_t offset1 = bp1 - bp, offset2 = tc_search_point - bp; | 479 | ptrdiff_t offset1 = bp1 - bp, offset2 = tc_search_point - bp; |
| 480 | malloc_size = offset1 + buf.size; | 480 | malloc_size = offset1 + buf.size; |
| 481 | bp = termcap_name = (char *) xrealloc (bp, malloc_size); | 481 | bp = termcap_name = xrealloc (bp, malloc_size); |
| 482 | bp1 = termcap_name + offset1; | 482 | bp1 = termcap_name + offset1; |
| 483 | tc_search_point = termcap_name + offset2; | 483 | tc_search_point = termcap_name + offset2; |
| 484 | } | 484 | } |
| @@ -504,7 +504,7 @@ tgetent (char *bp, const char *name) | |||
| 504 | xfree (buf.beg); | 504 | xfree (buf.beg); |
| 505 | 505 | ||
| 506 | if (malloc_size) | 506 | if (malloc_size) |
| 507 | bp = (char *) xrealloc (bp, bp1 - bp + 1); | 507 | bp = xrealloc (bp, bp1 - bp + 1); |
| 508 | 508 | ||
| 509 | ret: | 509 | ret: |
| 510 | term_entry = bp; | 510 | term_entry = bp; |