aboutsummaryrefslogtreecommitdiffstats
path: root/src/xsmfns.c
diff options
context:
space:
mode:
authorRobin Templeton <[email protected]>2014-06-30 04:26:49 -0400
committerRobin Templeton <[email protected]>2015-04-18 18:49:07 -0400
commitc1ade6f79b74e611b15115736b91ef0e529f8fca (patch)
tree4e7ca0b24ee9f4d261f7e00cf12b648080d63457 /src/xsmfns.c
parent143439dda212371b5cc15b6b2e2cae52d9074734 (diff)
use xmalloc_atomic for many pointerless objects
* src/alloc.c (make_float, memory_full, refill_memory_reserve): * src/buffer.c (alloc_buffer_text): * src/ccl.c (Fccl_execute_on_string): * src/charset.c (Fdefine_charset_internal): * src/coding.c (encode_coding_object): * src/composite.c (get_composition_id): * src/dispnew.c (adjust_frame_message_buffer): * src/doc.c (Fsubstitute_command_keys): * src/doprnt.c (doprnt): * src/editfns.c (Fmessage, Fformat): * src/emacs.c (sort_args): * src/filelock.c (current_lock_owner): * src/fns.c (Fstring_as_unibyte, Fstring_to_unibyte): * src/ftfont.c (ftfont_get_open_type_spec): * src/gtkutil.c (get_utf8_string): * src/image.c (x_create_bitmap_from_file, x_create_bitmap_from_file) (x_create_x_image_and_pixmap, slurp_file, xbm_read_bitmap_data) (xpm_load, colors_in_color_table, pbm_read_file, png_load, tiff_load): * src/keyboard.c (parse_tool_bar_item): * src/lread.c (read1, init_obarray): * src/minibuf.c (read_minibuf_noninteractive): * src/print.c (PRINTPREPARE): * src/search.c (Freplace_match, syms_of_search): * src/sysdep.c (system_process_attributes): * src/term.c (init_tty): * src/termcap.c (tgetst1, tgetent) * src/tparam.c (tparam1): * src/widget.c (set_frame_size): * src/xdisp.c (init_xdisp): * src/xfns.c (x_encode_text, xic_create_fontsetname, x_window) (Fx_change_window_property): * src/xrdb.c (x_get_customization_string, magic_file_p, gethomedir) (get_user_db): * src/xselect.c (x_get_window_property, receive_incremental_selection): * src/xsmfns.c (smc_save_yourself_CB, x_session_initialize): * src/xterm.c (xim_initialize, x_term_init): Use xmalloc_atomic and related functions for allocating pointerless objects. Conflicts: src/alloc.c src/editfns.c src/fns.c src/xterm.c
Diffstat (limited to 'src/xsmfns.c')
-rw-r--r--src/xsmfns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 650cfaeee8..645e19951b 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -229,7 +229,7 @@ smc_save_yourself_CB (SmcConn smcConn,
props[props_idx]->vals[vp_idx].length = strlen (emacs_program);
props[props_idx]->vals[vp_idx++].value = emacs_program;
- smid_opt = xmalloc (strlen (SMID_OPT) + strlen (client_id) + 1);
+ smid_opt = xmalloc_atomic (strlen (SMID_OPT) + strlen (client_id) + 1);
strcpy (smid_opt, SMID_OPT);
strcat (smid_opt, client_id);
@@ -241,7 +241,7 @@ smc_save_yourself_CB (SmcConn smcConn,
if (cwd)
{
- chdir_opt = xmalloc (strlen (CHDIR_OPT) + strlen (cwd) + 1);
+ chdir_opt = xmalloc_atomic (strlen (CHDIR_OPT) + strlen (cwd) + 1);
strcpy (chdir_opt, CHDIR_OPT);
strcat (chdir_opt, cwd);
@@ -414,7 +414,7 @@ x_session_initialize (struct x_display_info *dpyinfo)
/* This malloc will not be freed, but it is only done once, and hopefully
not very large */
- emacs_program = xmalloc (name_len + 1);
+ emacs_program = xmalloc_atomic (name_len + 1);
emacs_program[0] = '\0';
if (! EQ (Vinvocation_directory, Qnil))