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/editfns.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/editfns.c')
| -rw-r--r-- | src/editfns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index 8812ed9e555..741a97f7113 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -2157,8 +2157,8 @@ set_time_zone_rule (const char *tzstring) | |||
| 2157 | for (from = environ; *from; from++) | 2157 | for (from = environ; *from; from++) |
| 2158 | continue; | 2158 | continue; |
| 2159 | envptrs = from - environ + 2; | 2159 | envptrs = from - environ + 2; |
| 2160 | newenv = to = (char **) xmalloc (envptrs * sizeof (char *) | 2160 | newenv = to = xmalloc (envptrs * sizeof (char *) |
| 2161 | + (tzstring ? strlen (tzstring) + 4 : 0)); | 2161 | + (tzstring ? strlen (tzstring) + 4 : 0)); |
| 2162 | 2162 | ||
| 2163 | /* Add TZSTRING to the end of environ, as a value for TZ. */ | 2163 | /* Add TZSTRING to the end of environ, as a value for TZ. */ |
| 2164 | if (tzstring) | 2164 | if (tzstring) |
| @@ -3477,7 +3477,7 @@ usage: (message-box FORMAT-STRING &rest ARGS) */) | |||
| 3477 | /* Copy the data so that it won't move when we GC. */ | 3477 | /* Copy the data so that it won't move when we GC. */ |
| 3478 | if (! message_text) | 3478 | if (! message_text) |
| 3479 | { | 3479 | { |
| 3480 | message_text = (char *)xmalloc (80); | 3480 | message_text = xmalloc (80); |
| 3481 | message_length = 80; | 3481 | message_length = 80; |
| 3482 | } | 3482 | } |
| 3483 | if (SBYTES (val) > message_length) | 3483 | if (SBYTES (val) > message_length) |