diff options
author | Robin Templeton <[email protected]> | 2014-06-30 04:26:49 -0400 |
---|---|---|
committer | Robin Templeton <[email protected]> | 2015-04-18 18:49:07 -0400 |
commit | c1ade6f79b74e611b15115736b91ef0e529f8fca (patch) | |
tree | 4e7ca0b24ee9f4d261f7e00cf12b648080d63457 /src/termcap.c | |
parent | 143439dda212371b5cc15b6b2e2cae52d9074734 (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/termcap.c')
-rw-r--r-- | src/termcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/termcap.c b/src/termcap.c index 8c766bd199..702d30bb70 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -150,7 +150,7 @@ tgetst1 (char *ptr, char **area) p = ptr; while ((c = *p++) && c != ':' && c != '\n') ; - ret = xmalloc (p - ptr + 1); + ret = xmalloc_atomic (p - ptr + 1); } else ret = *area; @@ -374,7 +374,7 @@ tgetent (char *bp, const char *name) if (!bp) { malloc_size = 1 + strlen (term); - bp = xmalloc (malloc_size); + bp = xmalloc_atomic (malloc_size); } strcpy (bp, term); goto ret; @@ -433,13 +433,13 @@ tgetent (char *bp, const char *name) buf.size = BUFSIZE; /* Add 1 to size to ensure room for terminating null. */ - buf.beg = xmalloc (buf.size + 1); + buf.beg = xmalloc_atomic (buf.size + 1); term = indirect ? indirect : (char *)name; if (!bp) { malloc_size = indirect ? strlen (tcenv) + 1 : buf.size; - bp = xmalloc (malloc_size); + bp = xmalloc_atomic (malloc_size); } tc_search_point = bp1 = bp; |