diff options
author | Dmitry Antipov <[email protected]> | 2012-07-05 10:32:41 +0400 |
---|---|---|
committer | Dmitry Antipov <[email protected]> | 2012-07-05 10:32:41 +0400 |
commit | 23f86fce48e1cc8118f0ea5cce49d1acfd4364c4 (patch) | |
tree | 837ae05f1ad4ad92936f804d580d95751779befe /src/msdos.c | |
parent | 0497dc44b44f148425ff76c4cb7ef0d2ead9750b (diff) |
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/msdos.c')
-rw-r--r-- | src/msdos.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/msdos.c b/src/msdos.c index ba26b7462e..64fc671fa4 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -2828,7 +2828,7 @@ IT_menu_create (void) { XMenu *menu; - menu = (XMenu *) xmalloc (sizeof (XMenu)); + menu = xmalloc (sizeof (XMenu)); menu->allocated = menu->count = menu->panecount = menu->width = 0; return menu; } @@ -2842,10 +2842,10 @@ IT_menu_make_room (XMenu *menu) if (menu->allocated == 0) { int count = menu->allocated = 10; - menu->text = (char **) xmalloc (count * sizeof (char *)); - menu->submenu = (XMenu **) xmalloc (count * sizeof (XMenu *)); - menu->panenumber = (int *) xmalloc (count * sizeof (int)); - menu->help_text = (const char **) xmalloc (count * sizeof (char *)); + menu->text = xmalloc (count * sizeof (char *)); + menu->submenu = xmalloc (count * sizeof (XMenu *)); + menu->panenumber = xmalloc (count * sizeof (int)); + menu->help_text = xmalloc (count * sizeof (char *)); } else if (menu->allocated == menu->count) { @@ -2926,7 +2926,7 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help) width = menu->width; /* We multiply width by 2 to account for possible control characters. FIXME: cater to non-ASCII characters in menus. */ - text = (struct glyph *) xmalloc ((width * 2 + 2) * sizeof (struct glyph)); + text = xmalloc ((width * 2 + 2) * sizeof (struct glyph)); ScreenGetCursor (&row, &col); mouse_get_xy (&mx, &my); IT_update_begin (sf); |