aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.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/xselect.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/xselect.c')
-rw-r--r--src/xselect.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 4d961d73bf1..67785b26353 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -180,16 +180,11 @@ x_queue_event (struct input_event *event)
180 } 180 }
181 } 181 }
182 182
183 queue_tmp 183 queue_tmp = xmalloc (sizeof (struct selection_event_queue));
184 = (struct selection_event_queue *) xmalloc (sizeof (struct selection_event_queue)); 184 TRACE1 ("QUEUE SELECTION EVENT %p", queue_tmp);
185 185 queue_tmp->event = *event;
186 if (queue_tmp != NULL) 186 queue_tmp->next = selection_queue;
187 { 187 selection_queue = queue_tmp;
188 TRACE1 ("QUEUE SELECTION EVENT %p", queue_tmp);
189 queue_tmp->event = *event;
190 queue_tmp->next = selection_queue;
191 selection_queue = queue_tmp;
192 }
193} 188}
194 189
195/* Start queuing SELECTION_REQUEST_EVENT events. */ 190/* Start queuing SELECTION_REQUEST_EVENT events. */
@@ -1085,7 +1080,7 @@ static struct prop_location *
1085expect_property_change (Display *display, Window window, 1080expect_property_change (Display *display, Window window,
1086 Atom property, int state) 1081 Atom property, int state)
1087{ 1082{
1088 struct prop_location *pl = (struct prop_location *) xmalloc (sizeof *pl); 1083 struct prop_location *pl = xmalloc (sizeof *pl);
1089 pl->identifier = ++prop_location_identifier; 1084 pl->identifier = ++prop_location_identifier;
1090 pl->display = display; 1085 pl->display = display;
1091 pl->window = window; 1086 pl->window = window;
@@ -1446,7 +1441,7 @@ receive_incremental_selection (Display *display, Window window, Atom property,
1446 struct prop_location *wait_object; 1441 struct prop_location *wait_object;
1447 if (min (PTRDIFF_MAX, SIZE_MAX) < min_size_bytes) 1442 if (min (PTRDIFF_MAX, SIZE_MAX) < min_size_bytes)
1448 memory_full (SIZE_MAX); 1443 memory_full (SIZE_MAX);
1449 *data_ret = (unsigned char *) xmalloc (min_size_bytes); 1444 *data_ret = xmalloc (min_size_bytes);
1450 *size_bytes_ret = min_size_bytes; 1445 *size_bytes_ret = min_size_bytes;
1451 1446
1452 TRACE1 ("Read %u bytes incrementally", min_size_bytes); 1447 TRACE1 ("Read %u bytes incrementally", min_size_bytes);
@@ -1780,7 +1775,7 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
1780 } 1775 }
1781 else if (SYMBOLP (obj)) 1776 else if (SYMBOLP (obj))
1782 { 1777 {
1783 *data_ret = (unsigned char *) xmalloc (sizeof (Atom) + 1); 1778 *data_ret = xmalloc (sizeof (Atom) + 1);
1784 *format_ret = 32; 1779 *format_ret = 32;
1785 *size_ret = 1; 1780 *size_ret = 1;
1786 (*data_ret) [sizeof (Atom)] = 0; 1781 (*data_ret) [sizeof (Atom)] = 0;
@@ -1789,7 +1784,7 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
1789 } 1784 }
1790 else if (RANGED_INTEGERP (X_SHRT_MIN, obj, X_SHRT_MAX)) 1785 else if (RANGED_INTEGERP (X_SHRT_MIN, obj, X_SHRT_MAX))
1791 { 1786 {
1792 *data_ret = (unsigned char *) xmalloc (sizeof (short) + 1); 1787 *data_ret = xmalloc (sizeof (short) + 1);
1793 *format_ret = 16; 1788 *format_ret = 16;
1794 *size_ret = 1; 1789 *size_ret = 1;
1795 (*data_ret) [sizeof (short)] = 0; 1790 (*data_ret) [sizeof (short)] = 0;
@@ -1802,7 +1797,7 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
1802 || (CONSP (XCDR (obj)) 1797 || (CONSP (XCDR (obj))
1803 && INTEGERP (XCAR (XCDR (obj))))))) 1798 && INTEGERP (XCAR (XCDR (obj)))))))
1804 { 1799 {
1805 *data_ret = (unsigned char *) xmalloc (sizeof (unsigned long) + 1); 1800 *data_ret = xmalloc (sizeof (unsigned long) + 1);
1806 *format_ret = 32; 1801 *format_ret = 32;
1807 *size_ret = 1; 1802 *size_ret = 1;
1808 (*data_ret) [sizeof (unsigned long)] = 0; 1803 (*data_ret) [sizeof (unsigned long)] = 0;