diff options
author | Daniel Colascione <dancol@dancol.org> | 2014-04-03 00:14:02 -0700 |
---|---|---|
committer | Daniel Colascione <dancol@dancol.org> | 2014-04-03 00:14:02 -0700 |
commit | 705cf384bec23354ad22a5c48d3430a96ef70ca1 (patch) | |
tree | 1615876bc7abad32f5e41ea34c5cd1747466798a /src | |
parent | 3a9e7a49deea49088a773c321e52185e922748d6 (diff) | |
download | emacs-705cf384bec23354ad22a5c48d3430a96ef70ca1.tar.gz |
Clean up array size calculations
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 61 | ||||
-rw-r--r-- | src/chartab.c | 8 | ||||
-rw-r--r-- | src/dired.c | 2 | ||||
-rw-r--r-- | src/dosfns.c | 4 | ||||
-rw-r--r-- | src/emacs.c | 5 | ||||
-rw-r--r-- | src/fileio.c | 2 | ||||
-rw-r--r-- | src/frame.c | 11 | ||||
-rw-r--r-- | src/fringe.c | 2 | ||||
-rw-r--r-- | src/image.c | 4 | ||||
-rw-r--r-- | src/keyboard.c | 37 | ||||
-rw-r--r-- | src/macfont.m | 15 | ||||
-rw-r--r-- | src/msdos.c | 4 | ||||
-rw-r--r-- | src/nsfns.m | 2 | ||||
-rw-r--r-- | src/nsterm.m | 3 | ||||
-rw-r--r-- | src/sysdep.c | 2 | ||||
-rw-r--r-- | src/term.c | 2 | ||||
-rw-r--r-- | src/unexcw.c | 3 | ||||
-rw-r--r-- | src/w32.c | 6 | ||||
-rw-r--r-- | src/w32fns.c | 3 | ||||
-rw-r--r-- | src/xfaces.c | 2 | ||||
-rw-r--r-- | src/xfns.c | 3 | ||||
-rw-r--r-- | src/xterm.c | 2 |
22 files changed, 111 insertions, 72 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 72449dc52af..a628148bbda 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,66 @@ 2014-04-03 Daniel Colascione <dancol@dancol.org> + In all places below, change expressions of the form sizeof(arr) / + sizeof(arr[0]) to EARRAYSIZE(arr). + + * xterm.c (x_term_init): See above. + + * xfns.c (best_xim_style): See above. + + * xfaces.c (Fdump_colors): See above. + + * w32fns.c (w32_default_color_map): See above. + + * w32.c: + (init_environment): See above. + (N_ENV_VARS): See above. + + * unexcw.c (read_exe_header): See above. + + * term.c (term_get_fkeys_1): See above. + + * sysdep.c (init_baud_rate): See above. + + * nsterm.m (ns_convert_key): See above. + + * nsfns.m (get_geometry_from_preferences): See above. + + * msdos.c (dos_set_window_size): See above. + (init_environment): See above. + + * macfont.m (mac_font_get_glyph_for_cid): See above. + (macfont_store_descriptor_attributes): See above. + (macfont_create_attributes_with_spec): See above. + (mac_ctfont_get_glyph_for_cid): See above. + + * keyboard.c (command_loop_1): See above. + (read_menu_command): See above. + (make_lispy_event): See above. + (NUM_MOD_NAMES): See above. + (read_key_sequence_vs): See above. + (Fcurrent_input_mode): See above. + (syms_of_keyboard): See above. + + * image.c (xpm_str_to_color_key): See above. + + * fringe.c (MAX_STANDARD_FRINGE_BITMAPS): See above. + + * frame.c (x_set_frame_parameters): See above. + + * fileio.c (Ffile_selinux_context): See above. + + * emacs.c (sort_args): See above. + + * dosfns.c (): + (msdos_stdcolor_name): See above. + + * dired.c (file_attributes): See above. + + * chartab.c: + (uniprop_decoder_count,uniprop_encode_count): See above. + +2014-04-02 Daniel Colascione <dancol@dancol.org> + * data.c (Ffset): Abort if we're trying to set a function call to a dead lisp object. diff --git a/src/chartab.c b/src/chartab.c index 2a8bbc6983a..56a6f548749 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1221,9 +1221,7 @@ uniprop_decode_value_run_length (Lisp_Object table, Lisp_Object value) static uniprop_decoder_t uniprop_decoder [] = { uniprop_decode_value_run_length }; -static int uniprop_decoder_count - = (sizeof uniprop_decoder) / sizeof (uniprop_decoder[0]); - +static const int uniprop_decoder_count = EARRAYSIZE (uniprop_decoder); /* Return the decoder of char-table TABLE or nil if none. */ @@ -1301,9 +1299,7 @@ static uniprop_encoder_t uniprop_encoder[] = uniprop_encode_value_run_length, uniprop_encode_value_numeric }; -static int uniprop_encoder_count - = (sizeof uniprop_encoder) / sizeof (uniprop_encoder[0]); - +static const int uniprop_encoder_count = EARRAYSIZE (uniprop_encoder); /* Return the encoder of char-table TABLE or nil if none. */ diff --git a/src/dired.c b/src/dired.c index 69d0ae0429c..5d99314fde0 100644 --- a/src/dired.c +++ b/src/dired.c @@ -984,7 +984,7 @@ file_attributes (int fd, char const *name, Lisp_Object id_format) values[10] = INTEGER_TO_CONS (s.st_ino); values[11] = INTEGER_TO_CONS (s.st_dev); - return Flist (sizeof (values) / sizeof (values[0]), values); + return Flist (EARRAYSIZE (values), values); } DEFUN ("file-attributes-lessp", Ffile_attributes_lessp, Sfile_attributes_lessp, 2, 2, 0, diff --git a/src/dosfns.c b/src/dosfns.c index 071d73ea16e..b98e3cd8f29 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -402,7 +402,7 @@ msdos_stdcolor_idx (const char *name) { int i; - for (i = 0; i < sizeof (vga_colors) / sizeof (vga_colors[0]); i++) + for (i = 0; i < EARRAYSIZE (vga_colors); i++) if (xstrcasecmp (name, vga_colors[i]) == 0) return i; @@ -422,7 +422,7 @@ msdos_stdcolor_name (int idx) return build_string (unspecified_fg); else if (idx == FACE_TTY_DEFAULT_BG_COLOR) return build_string (unspecified_bg); - else if (idx >= 0 && idx < sizeof (vga_colors) / sizeof (vga_colors[0])) + else if (idx >= 0 && idx < EARRAYSIZE (vga_colors)) return build_string (vga_colors[idx]); else return Qunspecified; /* meaning the default */ diff --git a/src/emacs.c b/src/emacs.c index 56096016d41..a481a9c3d7f 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1817,7 +1817,7 @@ sort_args (int argc, char **argv) } /* Look for a match with a known old-fashioned option. */ - for (i = 0; i < sizeof (standard_args) / sizeof (standard_args[0]); i++) + for (i = 0; i < EARRAYSIZE (standard_args); i++) if (!strcmp (argv[from], standard_args[i].name)) { options[from] = standard_args[i].nargs; @@ -1839,8 +1839,7 @@ sort_args (int argc, char **argv) match = -1; - for (i = 0; - i < sizeof (standard_args) / sizeof (standard_args[0]); i++) + for (i = 0; i < EARRAYSIZE (standard_args); i++) if (standard_args[i].longname && !strncmp (argv[from], standard_args[i].longname, thislen)) diff --git a/src/fileio.c b/src/fileio.c index 4d27b58d2b7..d317e169c26 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2909,7 +2909,7 @@ or if SELinux is disabled, or if Emacs lacks SELinux support. */) } #endif - return Flist (sizeof (values) / sizeof (values[0]), values); + return Flist (EARRAYSIZE (values), values); } DEFUN ("set-file-selinux-context", Fset_file_selinux_context, diff --git a/src/frame.c b/src/frame.c index c5a2f6ab245..3784e998753 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2867,8 +2867,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) param_index = Fget (prop, Qx_frame_parameter); if (NATNUMP (param_index) - && (XFASTINT (param_index) - < sizeof (frame_parms)/sizeof (frame_parms[0])) + && XFASTINT (param_index) < EARRAYSIZE (frame_parms) && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)]) (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); } @@ -2916,8 +2915,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) param_index = Fget (prop, Qx_frame_parameter); if (NATNUMP (param_index) - && (XFASTINT (param_index) - < sizeof (frame_parms)/sizeof (frame_parms[0])) + && XFASTINT (param_index) < EARRAYSIZE (frame_parms) && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)]) (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); } @@ -3228,8 +3226,7 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu { Lisp_Object parm_index = Fget (Qbackground_color, Qx_frame_parameter); if (NATNUMP (parm_index) - && (XFASTINT (parm_index) - < sizeof (frame_parms)/sizeof (frame_parms[0])) + && XFASTINT (parm_index) < EARRAYSIZE (frame_parms) && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)]) (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)]) (f, bgcolor, Qnil); @@ -4563,7 +4560,7 @@ syms_of_frame (void) { int i; - for (i = 0; i < sizeof (frame_parms) / sizeof (frame_parms[0]); i++) + for (i = 0; i < EARRAYSIZE (frame_parms); i++) { Lisp_Object v = intern_c_string (frame_parms[i].name); if (frame_parms[i].variable) diff --git a/src/fringe.c b/src/fringe.c index 6325de4128e..1dd95341857 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -474,7 +474,7 @@ static struct fringe_bitmap standard_bitmaps[] = #define NO_FRINGE_BITMAP 0 #define UNDEF_FRINGE_BITMAP 1 -#define MAX_STANDARD_FRINGE_BITMAPS (sizeof (standard_bitmaps)/sizeof (standard_bitmaps[0])) +#define MAX_STANDARD_FRINGE_BITMAPS EARRAYSIZE (standard_bitmaps) static struct fringe_bitmap **fringe_bitmaps; static Lisp_Object *fringe_faces; diff --git a/src/image.c b/src/image.c index 29a04e7da81..64bd41b52ab 100644 --- a/src/image.c +++ b/src/image.c @@ -3955,9 +3955,7 @@ xpm_str_to_color_key (const char *s) { int i; - for (i = 0; - i < sizeof xpm_color_key_strings / sizeof xpm_color_key_strings[0]; - i++) + for (i = 0; i < EARRAYSIZE (xpm_color_key_strings); i++) if (strcmp (xpm_color_key_strings[i], s) == 0) return i; return -1; diff --git a/src/keyboard.c b/src/keyboard.c index 439a40f8762..ccdb469bbb3 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1446,7 +1446,7 @@ command_loop_1 (void) Vthis_command_keys_shift_translated = Qnil; /* Read next key sequence; i gets its length. */ - i = read_key_sequence (keybuf, sizeof keybuf / sizeof keybuf[0], + i = read_key_sequence (keybuf, EARRAYSIZE (keybuf), Qnil, 0, 1, 1, 0); /* A filter may have run while we were reading the input. */ @@ -1694,7 +1694,7 @@ read_menu_command (void) menus. */ specbind (Qecho_keystrokes, make_number (0)); - i = read_key_sequence (keybuf, sizeof keybuf / sizeof keybuf[0], + i = read_key_sequence (keybuf, EARRAYSIZE (keybuf), Qnil, 0, 1, 1, 1); unbind_to (count, Qnil); @@ -5484,8 +5484,7 @@ make_lispy_event (struct input_event *event) event->modifiers, Qfunction_key, Qnil, lispy_accent_keys, &accent_key_syms, - (sizeof (lispy_accent_keys) - / sizeof (lispy_accent_keys[0]))); + EARRAYSIZE (lispy_accent_keys)); #if 0 #ifdef XK_kana_A @@ -5494,8 +5493,7 @@ make_lispy_event (struct input_event *event) event->modifiers & ~shift_modifier, Qfunction_key, Qnil, lispy_kana_keys, &func_key_syms, - (sizeof (lispy_kana_keys) - / sizeof (lispy_kana_keys[0]))); + EARRAYSIZE (lispy_kana_keys)); #endif /* XK_kana_A */ #endif /* 0 */ @@ -5506,8 +5504,7 @@ make_lispy_event (struct input_event *event) event->modifiers, Qfunction_key, Qnil, iso_lispy_function_keys, &func_key_syms, - (sizeof (iso_lispy_function_keys) - / sizeof (iso_lispy_function_keys[0]))); + EARRAYSIZE (iso_lispy_function_keys)); #endif /* Handle system-specific or unknown keysyms. */ @@ -5533,20 +5530,17 @@ make_lispy_event (struct input_event *event) event->modifiers, Qfunction_key, Qnil, lispy_function_keys, &func_key_syms, - (sizeof (lispy_function_keys) - / sizeof (lispy_function_keys[0]))); + EARRAYSIZE (lispy_function_keys)); #ifdef HAVE_NTGUI case MULTIMEDIA_KEY_EVENT: - if (event->code < (sizeof (lispy_multimedia_keys) - / sizeof (lispy_multimedia_keys[0])) + if (event->code < EARRAYSIZE (lispy_multimedia_keys) && event->code > 0 && lispy_multimedia_keys[event->code]) { return modify_event_symbol (event->code, event->modifiers, Qfunction_key, Qnil, lispy_multimedia_keys, &func_key_syms, - (sizeof (lispy_multimedia_keys) - / sizeof (lispy_multimedia_keys[0]))); + EARRAYSIZE (lispy_multimedia_keys)); } return Qnil; #endif @@ -6268,7 +6262,7 @@ static const char *const modifier_names[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "alt", "super", "hyper", "shift", "control", "meta" }; -#define NUM_MOD_NAMES (sizeof (modifier_names) / sizeof (modifier_names[0])) +#define NUM_MOD_NAMES EARRAYSIZE (modifier_names) static Lisp_Object modifier_symbols; @@ -9758,7 +9752,7 @@ read_key_sequence_vs (Lisp_Object prompt, Lisp_Object continue_echo, memset (keybuf, 0, sizeof keybuf); GCPRO1 (keybuf[0]); - gcpro1.nvars = (sizeof keybuf / sizeof (keybuf[0])); + gcpro1.nvars = EARRAYSIZE (keybuf); if (NILP (continue_echo)) { @@ -9772,7 +9766,7 @@ read_key_sequence_vs (Lisp_Object prompt, Lisp_Object continue_echo, cancel_hourglass (); #endif - i = read_key_sequence (keybuf, (sizeof keybuf / sizeof (keybuf[0])), + i = read_key_sequence (keybuf, EARRAYSIZE (keybuf), prompt, ! NILP (dont_downcase_last), ! NILP (can_return_switch_frame), 0, 0); @@ -10675,7 +10669,7 @@ The elements of this list correspond to the arguments of } XSETFASTINT (val[3], quit_char); - return Flist (sizeof (val) / sizeof (val[0]), val); + return Flist (EARRAYSIZE (val), val); } DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0, @@ -11043,7 +11037,7 @@ syms_of_keyboard (void) { int i; - int len = sizeof (head_table) / sizeof (head_table[0]); + int len = EARRAYSIZE (head_table); for (i = 0; i < len; i++) { @@ -11059,14 +11053,13 @@ syms_of_keyboard (void) staticpro (&button_down_location); mouse_syms = Fmake_vector (make_number (5), Qnil); staticpro (&mouse_syms); - wheel_syms = Fmake_vector (make_number (sizeof (lispy_wheel_names) - / sizeof (lispy_wheel_names[0])), + wheel_syms = Fmake_vector (make_number (EARRAYSIZE (lispy_wheel_names)), Qnil); staticpro (&wheel_syms); { int i; - int len = sizeof (modifier_names) / sizeof (modifier_names[0]); + int len = EARRAYSIZE (modifier_names); modifier_symbols = Fmake_vector (make_number (len), Qnil); for (i = 0; i < len; i++) diff --git a/src/macfont.m b/src/macfont.m index 075b512e686..447b08c723d 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -237,8 +237,7 @@ mac_font_get_glyph_for_cid (FontRef font, CharacterCollection collection, unichar characters[] = {0xfffd}; NSString *string = [NSString stringWithCharacters:characters - length:(sizeof (characters) - / sizeof (characters[0]))]; + length:EARRAYSIZE (characters)]; NSGlyphInfo *glyphInfo = [NSGlyphInfo glyphInfoWithCharacterIdentifier:cid collection:collection @@ -826,7 +825,7 @@ macfont_store_descriptor_attributes (FontDescriptorRef desc, {{0, 100}, {1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}}}; int i; - for (i = 0; i < sizeof (numeric_traits) / sizeof (numeric_traits[0]); i++) + for (i = 0; i < EARRAYSIZE (numeric_traits); i++) { num = CFDictionaryGetValue (dict, numeric_traits[i].trait); if (num && CFNumberGetValue (num, kCFNumberCGFloatType, &floatval)) @@ -1908,7 +1907,7 @@ macfont_create_attributes_with_spec (Lisp_Object spec) if (! traits) goto err; - for (i = 0; i < sizeof (numeric_traits) / sizeof (numeric_traits[0]); i++) + for (i = 0; i < EARRAYSIZE (numeric_traits); i++) { tmp = AREF (spec, numeric_traits[i].index); if (INTEGERP (tmp)) @@ -3584,7 +3583,7 @@ mac_ctfont_create_line_with_string_and_font (CFStringRef string, { attributes = CFDictionaryCreate (NULL, (const void **) keys, (const void **) values, - sizeof (keys) / sizeof (keys[0]), + EARRAYSIZE (keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFRelease (values[1]); @@ -3795,8 +3794,8 @@ mac_ctfont_get_glyph_for_cid (CTFontRef font, CTCharacterCollection collection, CTLineRef ctline = NULL; string = CFStringCreateWithCharacters (NULL, characters, - sizeof (characters) - / sizeof (characters[0])); + EARRAYSIZE (characters)); + if (string) { CTGlyphInfoRef glyph_info = @@ -3811,7 +3810,7 @@ mac_ctfont_get_glyph_for_cid (CTFontRef font, CTCharacterCollection collection, attributes = CFDictionaryCreate (NULL, (const void **) keys, (const void **) values, - sizeof (keys) / sizeof (keys[0]), + EARRAYSIZE (keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFRelease (glyph_info); diff --git a/src/msdos.c b/src/msdos.c index 1af66b391ad..2b636977f61 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -564,7 +564,7 @@ dos_set_window_size (int *rows, int *cols) }; int i = 0; - while (i < sizeof (std_dimension) / sizeof (std_dimension[0])) + while (i < EARRAYSIZE (std_dimension)) { if (std_dimension[i].need_vga <= have_vga && std_dimension[i].rows >= *rows) @@ -3465,7 +3465,7 @@ init_environment (int argc, char **argv, int skip_args) static const char * const tempdirs[] = { "$TMPDIR", "$TEMP", "$TMP", "c:/" }; - const int imax = sizeof (tempdirs) / sizeof (tempdirs[0]); + const int imax = EARRAYSIZE (tempdirs); /* Make sure they have a usable $TMPDIR. Many Emacs functions use temporary files and assume "/tmp" if $TMPDIR is unset, which diff --git a/src/nsfns.m b/src/nsfns.m index 58746aed9fa..d1692915bc7 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1024,7 +1024,7 @@ get_geometry_from_preferences (struct ns_display_info *dpyinfo, }; int i; - for (i = 0; i < sizeof (r)/sizeof (r[0]); ++i) + for (i = 0; i < EARRAYSIZE (r); ++i) { if (NILP (Fassq (r[i].tem, parms))) { diff --git a/src/nsterm.m b/src/nsterm.m index c7cb4faa3b7..fb4d4028140 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2012,8 +2012,7 @@ ns_convert_key (unsigned code) Internal call used by NSView-keyDown. -------------------------------------------------------------------------- */ { - const unsigned last_keysym = (sizeof (convert_ns_to_X_keysym) - / sizeof (convert_ns_to_X_keysym[0])); + const unsigned last_keysym = EARRAYSIZE (convert_ns_to_X_keysym); unsigned keysym; /* An array would be faster, but less easy to read. */ for (keysym = 0; keysym < last_keysym; keysym += 2) diff --git a/src/sysdep.c b/src/sysdep.c index b33900062ae..f1608c4ab21 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -255,7 +255,7 @@ init_baud_rate (int fd) #endif /* not DOS_NT */ } - baud_rate = (emacs_ospeed < sizeof baud_convert / sizeof baud_convert[0] + baud_rate = (emacs_ospeed < EARRAYSIZE (baud_convert) ? baud_convert[emacs_ospeed] : 9600); if (baud_rate == 0) baud_rate = 1200; diff --git a/src/term.c b/src/term.c index df5fc17a0c0..600c16ba820 100644 --- a/src/term.c +++ b/src/term.c @@ -1339,7 +1339,7 @@ term_get_fkeys_1 (void) if (!KEYMAPP (KVAR (kboard, Vinput_decode_map))) kset_input_decode_map (kboard, Fmake_sparse_keymap (Qnil)); - for (i = 0; i < (sizeof (keys) / sizeof (keys[0])); i++) + for (i = 0; i < EARRAYSIZE (keys); i++) { char *sequence = tgetstr (keys[i].cap, address); if (sequence) diff --git a/src/unexcw.c b/src/unexcw.c index 25d13ca0ca4..1809961a801 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -81,8 +81,7 @@ read_exe_header (int fd, exe_header_t * exe_header_buffer) #endif assert (exe_header_buffer->file_header.f_nscns > 0); assert (exe_header_buffer->file_header.f_nscns <= - sizeof (exe_header_buffer->section_header) / - sizeof (exe_header_buffer->section_header[0])); + EARRAYSIZE (exe_header_buffer->section_header)); assert (exe_header_buffer->file_header.f_opthdr > 0); ret = diff --git a/src/w32.c b/src/w32.c index 95092daa83a..e0fd60b1d20 100644 --- a/src/w32.c +++ b/src/w32.c @@ -1707,7 +1707,7 @@ static unsigned num_of_processors; /* We maintain 1-sec samples for the last 16 minutes in a circular buffer. */ static struct load_sample samples[16*60]; static int first_idx = -1, last_idx = -1; -static int max_idx = sizeof (samples) / sizeof (samples[0]); +static int max_idx = EARRAYSIZE (samples); static int buf_next (int from) @@ -2511,7 +2511,7 @@ init_environment (char ** argv) int i; - const int imax = sizeof (tempdirs) / sizeof (tempdirs[0]); + const int imax = EARRAYSIZE (tempdirs); /* Implementation note: This function explicitly works with ANSI file names, not with UTF-8 encoded file names. This is because @@ -2584,7 +2584,7 @@ init_environment (char ** argv) {"LANG", NULL}, }; -#define N_ENV_VARS sizeof (dflt_envvars)/sizeof (dflt_envvars[0]) +#define N_ENV_VARS EARRAYSIZE (dflt_envvars) /* We need to copy dflt_envvars[] and work on the copy because we don't want the dumped Emacs to inherit the values of diff --git a/src/w32fns.c b/src/w32fns.c index 080771f4cca..3c366022770 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -723,8 +723,7 @@ w32_default_color_map (void) cmap = Qnil; - for (i = 0; i < sizeof (w32_color_map) / sizeof (w32_color_map[0]); - pc++, i++) + for (i = 0; i < EARRAYSIZE (w32_color_map); pc++, i++) cmap = Fcons (Fcons (build_string (pc->name), make_number (pc->colorref)), cmap); diff --git a/src/xfaces.c b/src/xfaces.c index 4271e47c36f..bae315b2811 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -515,7 +515,7 @@ DEFUN ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0, fputc ('\n', stderr); - for (i = n = 0; i < sizeof color_count / sizeof color_count[0]; ++i) + for (i = n = 0; i < EARRAYSIZE (color_count); ++i) if (color_count[i]) { fprintf (stderr, "%3d: %5d", i, color_count[i]); diff --git a/src/xfns.c b/src/xfns.c index 692504ef762..ef827b55252 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1944,8 +1944,7 @@ static XIMStyle best_xim_style (XIMStyles *xim) { int i, j; - int nr_supported = - sizeof (supported_xim_styles) / sizeof (supported_xim_styles[0]); + int nr_supported = EARRAYSIZE (supported_xim_styles); for (i = 0; i < nr_supported; ++i) for (j = 0; j < xim->count_styles; ++j) diff --git a/src/xterm.c b/src/xterm.c index 8c4e78073dd..ee8fce047de 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10103,7 +10103,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) }; int i; - const int atom_count = sizeof (atom_refs) / sizeof (atom_refs[0]); + const int atom_count = EARRAYSIZE (atom_refs); /* 1 for _XSETTINGS_SN */ const int total_atom_count = 1 + atom_count; Atom *atoms_return = xmalloc (total_atom_count * sizeof *atoms_return); |