diff options
| author | Paul Eggert | 2023-05-17 15:36:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2023-05-17 15:41:00 -0700 |
| commit | 5ef169ed701fa4f850fdca5563cdd468207d5d4f (patch) | |
| tree | 949560affb29a8d9b114bac310a317a8209542ab /src/term.c | |
| parent | afbdae00ab59bbda971780fa04dd75dc7d1e7df7 (diff) | |
| download | emacs-5ef169ed701fa4f850fdca5563cdd468207d5d4f.tar.gz emacs-5ef169ed701fa4f850fdca5563cdd468207d5d4f.zip | |
Prefer C23 ckd_* to Gnulib *_WRAPV macros
C23 has added ckd_add etc. macros with functionality equivalent to
the older Gnulib INT_ADD_WRAPV macros, so switch to the
more-standard names.
* admin/merge-gnulib (GNULIB_MODULES): Add stdckdint.
This merely makes the dependency explicit, as we were already
using this Gnulib module indirectly.
* lib-src/etags.c, src/lisp.h: Include stdckdint.h.
* lib-src/etags.c (xnmalloc, xnrealloc):
* src/alloc.c (xnmalloc, xnrealloc, xpalloc, Fmake_string)
(mark_memory):
* src/bignum.c (emacs_mpz_pow_ui):
* src/buffer.c (record_overlay_string, overlay_strings):
* src/bytecode.c (exec_byte_code):
* src/casefiddle.c (do_casify_multibyte_string):
* src/ccl.c (ccl_driver, Fccl_execute_on_string):
* src/character.c (char_width, c_string_width)
(lisp_string_width, count_size_as_multibyte)
(string_escape_byte8):
* src/cmds.c (internal_self_insert):
* src/coding.c (coding_alloc_by_realloc, produce_chars):
* src/data.c (arith_driver):
* src/dispnew.c (realloc_glyph_pool, init_display_interactive):
* src/doprnt.c (parse_format_integer):
* src/editfns.c (Freplace_buffer_contents, str2num)
(styled_format):
* src/emacs-module.c (module_global_reference_p)
(module_make_global_ref, module_funcall):
* src/eval.c (max_ensure_room):
* src/fileio.c (blocks_to_bytes):
* src/fns.c (Ffillarray):
* src/font.c (font_intern_prop):
* src/frame.c (check_frame_pixels):
* src/gnutls.c (gnutls_hex_string, gnutls_symmetric_aead):
* src/gtkutil.c (get_utf8_string):
* src/haikuterm.c (haiku_term_init):
* src/image.c (xbm_scan, image_to_emacs_colors)
(image_detect_edges, png_load_body):
* src/keyboard.c (Frecursion_depth):
* src/keymap.c (Flookup_key, Fkey_description):
* src/lisp.h (modiff_incr, SAFE_ALLOCA_LISP_EXTRA):
* src/lread.c (read_bool_vector):
* src/pgtkterm.c (pgtk_term_init):
* src/regex-emacs.c (regex_compile):
* src/term.c (encode_terminal_code):
* src/termcap.c (tputs):
* src/textconv.c (textconv_query):
* src/timefns.c (timespec_ticks, lisp_time_hz_ticks)
(Fdecode_time, check_tm_member):
* src/tparam.c (tparam1):
* src/w32term.c (w32_initialize_display_info):
* src/xdisp.c (fill_column_indicator_column, decode_mode_spec):
* src/xselect.c (selection_data_size, x_property_data_to_lisp):
* src/xsmfns.c (smc_save_yourself_CB):
* src/xterm.c (xm_setup_dnd_targets, x_sync_get_monotonic_time)
(x_sync_current_monotonic_time, x_sync_note_frame_times)
(x_display_set_last_user_time, x_term_init):
Prefer the C23 stdckdint macros to their
Gnulib intprops.h counterparts, since C23 is standard.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index 2b28d3303e8..4df3de8f4a5 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -533,7 +533,7 @@ encode_terminal_code (struct glyph *src, int src_len, | |||
| 533 | multibyte-form. But, it may be enlarged on demand if | 533 | multibyte-form. But, it may be enlarged on demand if |
| 534 | Vglyph_table contains a string or a composite glyph is | 534 | Vglyph_table contains a string or a composite glyph is |
| 535 | encountered. */ | 535 | encountered. */ |
| 536 | if (INT_MULTIPLY_WRAPV (src_len, MAX_MULTIBYTE_LENGTH, &required)) | 536 | if (ckd_mul (&required, src_len, MAX_MULTIBYTE_LENGTH)) |
| 537 | memory_full (SIZE_MAX); | 537 | memory_full (SIZE_MAX); |
| 538 | if (encode_terminal_src_size < required) | 538 | if (encode_terminal_src_size < required) |
| 539 | encode_terminal_src = xpalloc (encode_terminal_src, | 539 | encode_terminal_src = xpalloc (encode_terminal_src, |