diff options
| author | Stefan Kangas | 2024-07-24 00:09:49 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2024-07-24 00:11:37 +0200 |
| commit | e25655756315ac398d15b308511a8e9abf20bb0e (patch) | |
| tree | 3e81a7dc0ab9abcfb9364b96f0f10559e61aef66 /src/sysdep.c | |
| parent | 19a18e487b8e2f0c1627b9cc98e601327e884eb2 (diff) | |
| download | emacs-scratch/static_assert.tar.gz emacs-scratch/static_assert.zip | |
Prefer static_assert to verifyscratch/static_assert
Although static_assert is C11-specific, and Emacs remains on C99, it
has been backported to older compilers by Gnulib. Gnulib has already
changed to prefer static_assert, and we can do the same.
* lib-src/asset-directory-tool.c (main_2):
* src/alloc.c (BLOCK_ALIGN, aligned_alloc, lisp_align_malloc)
(vectorlike_nbytes, allocate_pseudovector):
* src/android.c (android_globalize_reference, android_set_dashes):
* src/android.h:
* src/androidfont.c (androidfont_draw, androidfont_text_extents):
* src/androidvfs.c:
* src/bidi.c (BIDI_CACHE_MAX_ELTS_PER_SLOT)
(bidi_find_bracket_pairs):
* src/buffer.c (init_buffer_once):
* src/casefiddle.c (do_casify_multibyte_string):
* src/dispnew.c (scrolling_window, scrolling):
* src/editfns.c (styled_format):
* src/emacs-module.c (module_extract_big_integer):
* src/fileio.c (Fdo_auto_save):
* src/fns.c (next_almost_prime, hash_string):
* src/fringe.c (init_fringe):
* src/keyboard.h (kbd_buffer_store_event_hold):
* src/keymap.c:
* src/lisp.h (u, memclear, reduce_emacs_uint_to_hash_hash)
(modiff_incr):
* src/lread.c (skip_lazy_string):
* src/pdumper.c (dump_bignum, Fdump_emacs_portable)
(dump_do_dump_relocation, pdumper_load):
* src/process.c (make_process, Fmake_process)
(connect_network_socket):
* src/regex-emacs.c:
* src/sort.c (tim_sort):
* src/sysdep.c (init_random, SSIZE_MAX):
* src/thread.c:
* src/timefns.c (trillion_factor):
* src/unexelf.c:
* src/xterm.c (x_send_scroll_bar_event): Prefer static_assert to Gnulib
verify. Remove import of verify.h, except when used for other reasons.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index d916a695155..b19a8368aec 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -2248,7 +2248,7 @@ init_random (void) | |||
| 2248 | /* FIXME: Perhaps getrandom can be used here too? */ | 2248 | /* FIXME: Perhaps getrandom can be used here too? */ |
| 2249 | success = w32_init_random (&v, sizeof v) == 0; | 2249 | success = w32_init_random (&v, sizeof v) == 0; |
| 2250 | #else | 2250 | #else |
| 2251 | verify (sizeof v <= 256); | 2251 | static_assert (sizeof v <= 256); |
| 2252 | success = getrandom (&v, sizeof v, 0) == sizeof v; | 2252 | success = getrandom (&v, sizeof v, 0) == sizeof v; |
| 2253 | #endif | 2253 | #endif |
| 2254 | 2254 | ||
| @@ -2742,16 +2742,16 @@ emacs_fchmodat (int fd, const char *path, mode_t mode, int flags) | |||
| 2742 | #ifndef SSIZE_MAX | 2742 | #ifndef SSIZE_MAX |
| 2743 | # define SSIZE_MAX TYPE_MAXIMUM (ssize_t) | 2743 | # define SSIZE_MAX TYPE_MAXIMUM (ssize_t) |
| 2744 | #endif | 2744 | #endif |
| 2745 | verify (MAX_RW_COUNT <= PTRDIFF_MAX); | 2745 | static_assert (MAX_RW_COUNT <= PTRDIFF_MAX); |
| 2746 | verify (MAX_RW_COUNT <= SIZE_MAX); | 2746 | static_assert (MAX_RW_COUNT <= SIZE_MAX); |
| 2747 | verify (MAX_RW_COUNT <= SSIZE_MAX); | 2747 | static_assert (MAX_RW_COUNT <= SSIZE_MAX); |
| 2748 | 2748 | ||
| 2749 | #ifdef WINDOWSNT | 2749 | #ifdef WINDOWSNT |
| 2750 | /* Verify that Emacs read requests cannot cause trouble, even in | 2750 | /* Verify that Emacs read requests cannot cause trouble, even in |
| 2751 | 64-bit builds. The last argument of 'read' is 'unsigned int', and | 2751 | 64-bit builds. The last argument of 'read' is 'unsigned int', and |
| 2752 | the return value's type (see 'sys_read') is 'int'. */ | 2752 | the return value's type (see 'sys_read') is 'int'. */ |
| 2753 | verify (MAX_RW_COUNT <= INT_MAX); | 2753 | static_assert (MAX_RW_COUNT <= INT_MAX); |
| 2754 | verify (MAX_RW_COUNT <= UINT_MAX); | 2754 | static_assert (MAX_RW_COUNT <= UINT_MAX); |
| 2755 | #endif | 2755 | #endif |
| 2756 | 2756 | ||
| 2757 | /* Read from FD to a buffer BUF with size NBYTE. | 2757 | /* Read from FD to a buffer BUF with size NBYTE. |