diff options
| author | Dmitry Antipov | 2012-07-05 10:32:41 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-05 10:32:41 +0400 |
| commit | 23f86fce48e1cc8118f0ea5cce49d1acfd4364c4 (patch) | |
| tree | 837ae05f1ad4ad92936f804d580d95751779befe /src/termcap.c | |
| parent | 0497dc44b44f148425ff76c4cb7ef0d2ead9750b (diff) | |
| download | emacs-23f86fce48e1cc8118f0ea5cce49d1acfd4364c4.tar.gz emacs-23f86fce48e1cc8118f0ea5cce49d1acfd4364c4.zip | |
Cleanup xmalloc.
* admin/coccinelle/xzalloc.cocci: Semantic patch to convert
calls to xmalloc with following memset to xzalloc.
* src/lisp.h (xzalloc): New prototype. Omit needless casts.
* src/alloc.c (xzalloc): New function. Omit needless casts.
* src/charset.c: Omit needless casts. Convert all calls to
malloc with following memset to xzalloc.
* src/dispnew.c: Likewise.
* src/fringe.c: Likewise.
* src/image.c: Likewise.
* src/sound.c: Likewise.
* src/term.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32font.c: Likewise.
* src/w32term.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xterm.c: Likewise.
* src/atimer.c: Omit needless casts.
* src/buffer.c: Likewise.
* src/callproc.c: Likewise.
* src/ccl.c: Likewise.
* src/coding.c: Likewise.
* src/composite.c: Likewise.
* src/doc.c: Likewise.
* src/doprnt.c: Likewise.
* src/editfns.c: Likewise.
* src/emacs.c: Likewise.
* src/eval.c: Likewise.
* src/filelock.c: Likewise.
* src/fns.c: Likewise.
* src/gtkutil.c: Likewise.
* src/keyboard.c: Likewise.
* src/lisp.h: Likewise.
* src/lread.c: Likewise.
* src/minibuf.c: Likewise.
* src/msdos.c: Likewise.
* src/print.c: Likewise.
* src/process.c: Likewise.
* src/region-cache.c: Likewise.
* src/search.c: Likewise.
* src/sysdep.c: Likewise.
* src/termcap.c: Likewise.
* src/terminal.c: Likewise.
* src/tparam.c: Likewise.
* src/w16select.c: Likewise.
* src/w32.c: Likewise.
* src/w32reg.c: Likewise.
* src/w32select.c: Likewise.
* src/w32uniscribe.c: Likewise.
* src/widget.c: Likewise.
* src/xdisp.c: Likewise.
* src/xmenu.c: Likewise.
* src/xrdb.c: Likewise.
* src/xselect.c: Likewise.
Diffstat (limited to 'src/termcap.c')
| -rw-r--r-- | src/termcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/termcap.c b/src/termcap.c index 61f9d9a31ea..ea096d789da 100644 --- a/src/termcap.c +++ b/src/termcap.c | |||
| @@ -153,7 +153,7 @@ tgetst1 (char *ptr, char **area) | |||
| 153 | p = ptr; | 153 | p = ptr; |
| 154 | while ((c = *p++) && c != ':' && c != '\n') | 154 | while ((c = *p++) && c != ':' && c != '\n') |
| 155 | ; | 155 | ; |
| 156 | ret = (char *) xmalloc (p - ptr + 1); | 156 | ret = xmalloc (p - ptr + 1); |
| 157 | } | 157 | } |
| 158 | else | 158 | else |
| 159 | ret = *area; | 159 | ret = *area; |
| @@ -377,7 +377,7 @@ tgetent (char *bp, const char *name) | |||
| 377 | if (!bp) | 377 | if (!bp) |
| 378 | { | 378 | { |
| 379 | malloc_size = 1 + strlen (term); | 379 | malloc_size = 1 + strlen (term); |
| 380 | bp = (char *) xmalloc (malloc_size); | 380 | bp = xmalloc (malloc_size); |
| 381 | } | 381 | } |
| 382 | strcpy (bp, term); | 382 | strcpy (bp, term); |
| 383 | goto ret; | 383 | goto ret; |
| @@ -440,13 +440,13 @@ tgetent (char *bp, const char *name) | |||
| 440 | 440 | ||
| 441 | buf.size = BUFSIZE; | 441 | buf.size = BUFSIZE; |
| 442 | /* Add 1 to size to ensure room for terminating null. */ | 442 | /* Add 1 to size to ensure room for terminating null. */ |
| 443 | buf.beg = (char *) xmalloc (buf.size + 1); | 443 | buf.beg = xmalloc (buf.size + 1); |
| 444 | term = indirect ? indirect : (char *)name; | 444 | term = indirect ? indirect : (char *)name; |
| 445 | 445 | ||
| 446 | if (!bp) | 446 | if (!bp) |
| 447 | { | 447 | { |
| 448 | malloc_size = indirect ? strlen (tcenv) + 1 : buf.size; | 448 | malloc_size = indirect ? strlen (tcenv) + 1 : buf.size; |
| 449 | bp = (char *) xmalloc (malloc_size); | 449 | bp = xmalloc (malloc_size); |
| 450 | } | 450 | } |
| 451 | tc_search_point = bp1 = bp; | 451 | tc_search_point = bp1 = bp; |
| 452 | 452 | ||