aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-07-05 10:32:41 +0400
committerDmitry Antipov2012-07-05 10:32:41 +0400
commit23f86fce48e1cc8118f0ea5cce49d1acfd4364c4 (patch)
tree837ae05f1ad4ad92936f804d580d95751779befe /src/w32term.c
parent0497dc44b44f148425ff76c4cb7ef0d2ead9750b (diff)
downloademacs-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/w32term.c')
-rw-r--r--src/w32term.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/w32term.c b/src/w32term.c
index c0c137b9a9d..6f0065de9eb 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -285,8 +285,7 @@ XChangeGC (void *ignore, XGCValues *gc, unsigned long mask,
285XGCValues * 285XGCValues *
286XCreateGC (void *ignore, Window window, unsigned long mask, XGCValues *xgcv) 286XCreateGC (void *ignore, Window window, unsigned long mask, XGCValues *xgcv)
287{ 287{
288 XGCValues *gc = (XGCValues *) xmalloc (sizeof (XGCValues)); 288 XGCValues *gc = xzalloc (sizeof (XGCValues));
289 memset (gc, 0, sizeof (XGCValues));
290 289
291 XChangeGC (ignore, gc, mask, xgcv); 290 XChangeGC (ignore, gc, mask, xgcv);
292 291
@@ -6060,10 +6059,8 @@ w32_initialize_display_info (Lisp_Object display_name)
6060 w32_display_name_list); 6059 w32_display_name_list);
6061 dpyinfo->name_list_element = XCAR (w32_display_name_list); 6060 dpyinfo->name_list_element = XCAR (w32_display_name_list);
6062 6061
6063 dpyinfo->w32_id_name 6062 dpyinfo->w32_id_name = xmalloc (SCHARS (Vinvocation_name)
6064 = (char *) xmalloc (SCHARS (Vinvocation_name) 6063 + SCHARS (Vsystem_name) + 2);
6065 + SCHARS (Vsystem_name)
6066 + 2);
6067 sprintf (dpyinfo->w32_id_name, "%s@%s", 6064 sprintf (dpyinfo->w32_id_name, "%s@%s",
6068 SDATA (Vinvocation_name), SDATA (Vsystem_name)); 6065 SDATA (Vinvocation_name), SDATA (Vsystem_name));
6069 6066
@@ -6228,7 +6225,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
6228 /* We don't yet support separate terminals on W32, so don't try to share 6225 /* We don't yet support separate terminals on W32, so don't try to share
6229 keyboards between virtual terminals that are on the same physical 6226 keyboards between virtual terminals that are on the same physical
6230 terminal like X does. */ 6227 terminal like X does. */
6231 terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); 6228 terminal->kboard = xmalloc (sizeof (KBOARD));
6232 init_kboard (terminal->kboard); 6229 init_kboard (terminal->kboard);
6233 KVAR (terminal->kboard, Vwindow_system) = intern ("w32"); 6230 KVAR (terminal->kboard, Vwindow_system) = intern ("w32");
6234 terminal->kboard->next_kboard = all_kboards; 6231 terminal->kboard->next_kboard = all_kboards;
@@ -6280,7 +6277,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
6280 terminal = w32_create_terminal (dpyinfo); 6277 terminal = w32_create_terminal (dpyinfo);
6281 6278
6282 /* Set the name of the terminal. */ 6279 /* Set the name of the terminal. */
6283 terminal->name = (char *) xmalloc (SBYTES (display_name) + 1); 6280 terminal->name = xmalloc (SBYTES (display_name) + 1);
6284 strncpy (terminal->name, SDATA (display_name), SBYTES (display_name)); 6281 strncpy (terminal->name, SDATA (display_name), SBYTES (display_name));
6285 terminal->name[SBYTES (display_name)] = 0; 6282 terminal->name[SBYTES (display_name)] = 0;
6286 6283