------------------------------------------------------------
revno: 116936
committer: Daniel Colascione <dancol@dancol.org>
branch nick: trunk
timestamp: Thu 2014-04-03 13:46:04 -0700
message:
  Rename EARRAYSIZE to ARRAYELTS
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2014-04-03 07:14:02 +0000
+++ src/ChangeLog	2014-04-03 20:46:04 +0000
@@ -1,7 +1,7 @@
 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).
+	sizeof(arr[0]) to ARRAYELTS(arr).
 
 	* xterm.c (x_term_init): See above.
 
@@ -64,7 +64,7 @@
 	* data.c (Ffset): Abort if we're trying to set a function call to
 	a dead lisp object.
 
-	* lisp.h (EARRAYSIZE): New macro.
+	* lisp.h (ARRAYELTS): New macro.
 
 	* alloc.c: Include execinfo.h if available.
 	(SUSPICIOUS_OBJECT_CHECKING): New macro; define unconditionally.

=== modified file 'src/alloc.c'
--- src/alloc.c	2014-04-03 00:37:51 +0000
+++ src/alloc.c	2014-04-03 20:46:04 +0000
@@ -6835,7 +6835,7 @@
   char* end_a = end;
   int i;
 
-  for (i = 0; i < EARRAYSIZE (suspicious_objects); ++i) {
+  for (i = 0; i < ARRAYELTS (suspicious_objects); ++i) {
     char* suspicious_object = suspicious_objects[i];
     if (begin_a <= suspicious_object && suspicious_object < end_a)
       return suspicious_object;
@@ -6852,12 +6852,12 @@
 
   eassert (ptr != NULL);
 
-  for (i = 0; i < EARRAYSIZE (suspicious_objects); ++i)
+  for (i = 0; i < ARRAYELTS (suspicious_objects); ++i)
     if (suspicious_objects[i] == ptr)
       {
         rec = &suspicious_free_history[suspicious_free_history_index++];
         if (suspicious_free_history_index ==
-            EARRAYSIZE (suspicious_free_history))
+            ARRAYELTS (suspicious_free_history))
           {
             suspicious_free_history_index = 0;
           }
@@ -6865,7 +6865,7 @@
         memset (rec, 0, sizeof (*rec));
         rec->suspicious_object = ptr;
 #ifdef HAVE_EXECINFO_H
-        backtrace (&rec->backtrace[0], EARRAYSIZE (rec->backtrace));
+        backtrace (&rec->backtrace[0], ARRAYELTS (rec->backtrace));
 #endif
         suspicious_objects[i] = NULL;
       }
@@ -6884,7 +6884,7 @@
   /* Right now, we care only about vectors.  */
   if (VECTORLIKEP (obj)) {
     suspicious_objects[suspicious_object_index++] = XVECTOR (obj);
-    if (suspicious_object_index == EARRAYSIZE (suspicious_objects))
+    if (suspicious_object_index == ARRAYELTS (suspicious_objects))
       suspicious_object_index = 0;
   }
 #endif

=== modified file 'src/chartab.c'
--- src/chartab.c	2014-04-03 07:14:02 +0000
+++ src/chartab.c	2014-04-03 20:46:04 +0000
@@ -1221,7 +1221,7 @@
 static uniprop_decoder_t uniprop_decoder [] =
   { uniprop_decode_value_run_length };
 
-static const int uniprop_decoder_count = EARRAYSIZE (uniprop_decoder);
+static const int uniprop_decoder_count = ARRAYELTS (uniprop_decoder);
 
 /* Return the decoder of char-table TABLE or nil if none.  */
 
@@ -1299,7 +1299,7 @@
     uniprop_encode_value_run_length,
     uniprop_encode_value_numeric };
 
-static const int uniprop_encoder_count = EARRAYSIZE (uniprop_encoder);
+static const int uniprop_encoder_count = ARRAYELTS (uniprop_encoder);
 
 /* Return the encoder of char-table TABLE or nil if none.  */
 

=== modified file 'src/dired.c'
--- src/dired.c	2014-04-03 07:14:02 +0000
+++ src/dired.c	2014-04-03 20:46:04 +0000
@@ -984,7 +984,7 @@
   values[10] = INTEGER_TO_CONS (s.st_ino);
   values[11] = INTEGER_TO_CONS (s.st_dev);
 
-  return Flist (EARRAYSIZE (values), values);
+  return Flist (ARRAYELTS (values), values);
 }
 
 DEFUN ("file-attributes-lessp", Ffile_attributes_lessp, Sfile_attributes_lessp, 2, 2, 0,

=== modified file 'src/dosfns.c'
--- src/dosfns.c	2014-04-03 07:14:02 +0000
+++ src/dosfns.c	2014-04-03 20:46:04 +0000
@@ -402,7 +402,7 @@
 {
   int i;
 
-  for (i = 0; i < EARRAYSIZE (vga_colors); i++)
+  for (i = 0; i < ARRAYELTS (vga_colors); i++)
     if (xstrcasecmp (name, vga_colors[i]) == 0)
       return i;
 
@@ -422,7 +422,7 @@
     return build_string (unspecified_fg);
   else if (idx == FACE_TTY_DEFAULT_BG_COLOR)
     return build_string (unspecified_bg);
-  else if (idx >= 0 && idx < EARRAYSIZE (vga_colors))
+  else if (idx >= 0 && idx < ARRAYELTS (vga_colors))
     return build_string (vga_colors[idx]);
   else
     return Qunspecified;	/* meaning the default */

=== modified file 'src/emacs.c'
--- src/emacs.c	2014-04-03 07:14:02 +0000
+++ src/emacs.c	2014-04-03 20:46:04 +0000
@@ -1817,7 +1817,7 @@
 	    }
 
 	  /* Look for a match with a known old-fashioned option.  */
-	  for (i = 0; i < EARRAYSIZE (standard_args); i++)
+	  for (i = 0; i < ARRAYELTS (standard_args); i++)
 	    if (!strcmp (argv[from], standard_args[i].name))
 	      {
 		options[from] = standard_args[i].nargs;
@@ -1839,7 +1839,7 @@
 
 	      match = -1;
 
-	      for (i = 0; i < EARRAYSIZE (standard_args); i++)
+	      for (i = 0; i < ARRAYELTS (standard_args); i++)
 		if (standard_args[i].longname
 		    && !strncmp (argv[from], standard_args[i].longname,
 				 thislen))

=== modified file 'src/fileio.c'
--- src/fileio.c	2014-04-03 07:14:02 +0000
+++ src/fileio.c	2014-04-03 20:46:04 +0000
@@ -2909,7 +2909,7 @@
     }
 #endif
 
-  return Flist (EARRAYSIZE (values), values);
+  return Flist (ARRAYELTS (values), values);
 }
 
 DEFUN ("set-file-selinux-context", Fset_file_selinux_context,

=== modified file 'src/frame.c'
--- src/frame.c	2014-04-03 07:14:02 +0000
+++ src/frame.c	2014-04-03 20:46:04 +0000
@@ -2867,7 +2867,7 @@
 
 	      param_index = Fget (prop, Qx_frame_parameter);
 	      if (NATNUMP (param_index)
-		  && XFASTINT (param_index) < EARRAYSIZE (frame_parms)
+		  && XFASTINT (param_index) < ARRAYELTS (frame_parms)
                   && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])
                 (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value);
 	    }
@@ -2915,7 +2915,7 @@
 
 	  param_index = Fget (prop, Qx_frame_parameter);
 	  if (NATNUMP (param_index)
-	      && XFASTINT (param_index) < EARRAYSIZE (frame_parms)
+	      && XFASTINT (param_index) < ARRAYELTS (frame_parms)
 	      && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])
 	    (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value);
 	}
@@ -3226,7 +3226,7 @@
     {
       Lisp_Object parm_index = Fget (Qbackground_color, Qx_frame_parameter);
       if (NATNUMP (parm_index)
-	  && XFASTINT (parm_index) < EARRAYSIZE (frame_parms)
+	  && XFASTINT (parm_index) < ARRAYELTS (frame_parms)
 	  && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)])
 	  (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)])
 	    (f, bgcolor, Qnil);
@@ -4560,7 +4560,7 @@
   {
     int i;
 
-    for (i = 0; i < EARRAYSIZE (frame_parms); i++)
+    for (i = 0; i < ARRAYELTS (frame_parms); i++)
       {
 	Lisp_Object v = intern_c_string (frame_parms[i].name);
 	if (frame_parms[i].variable)

=== modified file 'src/fringe.c'
--- src/fringe.c	2014-04-03 07:14:02 +0000
+++ src/fringe.c	2014-04-03 20:46:04 +0000
@@ -474,7 +474,7 @@
 
 #define NO_FRINGE_BITMAP 0
 #define UNDEF_FRINGE_BITMAP 1
-#define MAX_STANDARD_FRINGE_BITMAPS EARRAYSIZE (standard_bitmaps)
+#define MAX_STANDARD_FRINGE_BITMAPS ARRAYELTS (standard_bitmaps)
 
 static struct fringe_bitmap **fringe_bitmaps;
 static Lisp_Object *fringe_faces;

=== modified file 'src/image.c'
--- src/image.c	2014-04-03 07:14:02 +0000
+++ src/image.c	2014-04-03 20:46:04 +0000
@@ -3955,7 +3955,7 @@
 {
   int i;
 
-  for (i = 0; i < EARRAYSIZE (xpm_color_key_strings); i++)
+  for (i = 0; i < ARRAYELTS (xpm_color_key_strings); i++)
     if (strcmp (xpm_color_key_strings[i], s) == 0)
       return i;
   return -1;

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2014-04-03 07:14:02 +0000
+++ src/keyboard.c	2014-04-03 20:46:04 +0000
@@ -1446,7 +1446,7 @@
       Vthis_command_keys_shift_translated = Qnil;
 
       /* Read next key sequence; i gets its length.  */
-      i = read_key_sequence (keybuf, EARRAYSIZE (keybuf),
+      i = read_key_sequence (keybuf, ARRAYELTS (keybuf),
 			     Qnil, 0, 1, 1, 0);
 
       /* A filter may have run while we were reading the input.  */
@@ -1694,7 +1694,7 @@
      menus.  */
   specbind (Qecho_keystrokes, make_number (0));
 
-  i = read_key_sequence (keybuf, EARRAYSIZE (keybuf),
+  i = read_key_sequence (keybuf, ARRAYELTS (keybuf),
 			 Qnil, 0, 1, 1, 1);
 
   unbind_to (count, Qnil);
@@ -5484,7 +5484,7 @@
 				      event->modifiers,
 				      Qfunction_key, Qnil,
 				      lispy_accent_keys, &accent_key_syms,
-                                      EARRAYSIZE (lispy_accent_keys));
+                                      ARRAYELTS (lispy_accent_keys));
 
 #if 0
 #ifdef XK_kana_A
@@ -5493,7 +5493,7 @@
 				    event->modifiers & ~shift_modifier,
 				    Qfunction_key, Qnil,
 				    lispy_kana_keys, &func_key_syms,
-                                    EARRAYSIZE (lispy_kana_keys));
+                                    ARRAYELTS (lispy_kana_keys));
 #endif /* XK_kana_A */
 #endif /* 0 */
 
@@ -5504,7 +5504,7 @@
 				    event->modifiers,
 				    Qfunction_key, Qnil,
 				    iso_lispy_function_keys, &func_key_syms,
-                                    EARRAYSIZE (iso_lispy_function_keys));
+                                    ARRAYELTS (iso_lispy_function_keys));
 #endif
 
       /* Handle system-specific or unknown keysyms.  */
@@ -5530,17 +5530,17 @@
 				  event->modifiers,
 				  Qfunction_key, Qnil,
 				  lispy_function_keys, &func_key_syms,
-                                  EARRAYSIZE (lispy_function_keys));
+                                  ARRAYELTS (lispy_function_keys));
 
 #ifdef HAVE_NTGUI
     case MULTIMEDIA_KEY_EVENT:
-      if (event->code < EARRAYSIZE (lispy_multimedia_keys)
+      if (event->code < ARRAYELTS (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,
-                                      EARRAYSIZE (lispy_multimedia_keys));
+                                      ARRAYELTS (lispy_multimedia_keys));
         }
       return Qnil;
 #endif
@@ -6262,7 +6262,7 @@
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, "alt", "super", "hyper", "shift", "control", "meta"
 };
-#define NUM_MOD_NAMES EARRAYSIZE (modifier_names)
+#define NUM_MOD_NAMES ARRAYELTS (modifier_names)
 
 static Lisp_Object modifier_symbols;
 
@@ -9752,7 +9752,7 @@
 
   memset (keybuf, 0, sizeof keybuf);
   GCPRO1 (keybuf[0]);
-  gcpro1.nvars = EARRAYSIZE (keybuf);
+  gcpro1.nvars = ARRAYELTS (keybuf);
 
   if (NILP (continue_echo))
     {
@@ -9766,7 +9766,7 @@
     cancel_hourglass ();
 #endif
 
-  i = read_key_sequence (keybuf, EARRAYSIZE (keybuf),
+  i = read_key_sequence (keybuf, ARRAYELTS (keybuf),
 			 prompt, ! NILP (dont_downcase_last),
 			 ! NILP (can_return_switch_frame), 0, 0);
 
@@ -10669,7 +10669,7 @@
     }
   XSETFASTINT (val[3], quit_char);
 
-  return Flist (EARRAYSIZE (val), val);
+  return Flist (ARRAYELTS (val), val);
 }
 
 DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0,
@@ -11037,7 +11037,7 @@
 
   {
     int i;
-    int len = EARRAYSIZE (head_table);
+    int len = ARRAYELTS (head_table);
 
     for (i = 0; i < len; i++)
       {
@@ -11053,13 +11053,13 @@
   staticpro (&button_down_location);
   mouse_syms = Fmake_vector (make_number (5), Qnil);
   staticpro (&mouse_syms);
-  wheel_syms = Fmake_vector (make_number (EARRAYSIZE (lispy_wheel_names)),
+  wheel_syms = Fmake_vector (make_number (ARRAYELTS (lispy_wheel_names)),
 			     Qnil);
   staticpro (&wheel_syms);
 
   {
     int i;
-    int len = EARRAYSIZE (modifier_names);
+    int len = ARRAYELTS (modifier_names);
 
     modifier_symbols = Fmake_vector (make_number (len), Qnil);
     for (i = 0; i < len; i++)

=== modified file 'src/lisp.h'
--- src/lisp.h	2014-04-03 00:18:08 +0000
+++ src/lisp.h	2014-04-03 20:46:04 +0000
@@ -59,7 +59,7 @@
 #define min(a, b) ((a) < (b) ? (a) : (b))
 
 /* Find number of elements in array */
-#define EARRAYSIZE(arr) (sizeof (arr) / sizeof ((arr)[0]))
+#define ARRAYELTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
 
 /* EMACS_INT - signed integer wide enough to hold an Emacs value
    EMACS_INT_MAX - maximum value of EMACS_INT; can be used in #if

=== modified file 'src/macfont.m'
--- src/macfont.m	2014-04-03 07:14:02 +0000
+++ src/macfont.m	2014-04-03 20:46:04 +0000
@@ -237,7 +237,7 @@
     unichar characters[] = {0xfffd};
     NSString *string =
       [NSString stringWithCharacters:characters
-			      length:EARRAYSIZE (characters)];
+			      length:ARRAYELTS (characters)];
     NSGlyphInfo *glyphInfo =
       [NSGlyphInfo glyphInfoWithCharacterIdentifier:cid
 					 collection:collection
@@ -825,7 +825,7 @@
 	    {{0, 100}, {1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}}};
       int i;
 
-      for (i = 0; i < EARRAYSIZE (numeric_traits); i++)
+      for (i = 0; i < ARRAYELTS (numeric_traits); i++)
 	{
 	  num = CFDictionaryGetValue (dict, numeric_traits[i].trait);
 	  if (num && CFNumberGetValue (num, kCFNumberCGFloatType, &floatval))
@@ -1907,7 +1907,7 @@
   if (! traits)
     goto err;
 
-  for (i = 0; i < EARRAYSIZE (numeric_traits); i++)
+  for (i = 0; i < ARRAYELTS (numeric_traits); i++)
     {
       tmp = AREF (spec, numeric_traits[i].index);
       if (INTEGERP (tmp))
@@ -3583,7 +3583,7 @@
     {
       attributes = CFDictionaryCreate (NULL, (const void **) keys,
 				       (const void **) values,
-                                       EARRAYSIZE (keys),
+                                       ARRAYELTS (keys),
 				       &kCFTypeDictionaryKeyCallBacks,
 				       &kCFTypeDictionaryValueCallBacks);
       CFRelease (values[1]);
@@ -3794,7 +3794,7 @@
   CTLineRef ctline = NULL;
 
   string = CFStringCreateWithCharacters (NULL, characters,
-                                         EARRAYSIZE (characters));
+                                         ARRAYELTS (characters));
 
   if (string)
     {
@@ -3810,7 +3810,7 @@
 
 	  attributes = CFDictionaryCreate (NULL, (const void **) keys,
 					   (const void **) values,
-                                           EARRAYSIZE (keys),
+                                           ARRAYELTS (keys),
 					   &kCFTypeDictionaryKeyCallBacks,
 					   &kCFTypeDictionaryValueCallBacks);
 	  CFRelease (glyph_info);

=== modified file 'src/msdos.c'
--- src/msdos.c	2014-04-03 07:14:02 +0000
+++ src/msdos.c	2014-04-03 20:46:04 +0000
@@ -564,7 +564,7 @@
       };
       int i = 0;
 
-      while (i < EARRAYSIZE (std_dimension))
+      while (i < ARRAYELTS (std_dimension))
 	{
 	 if (std_dimension[i].need_vga <= have_vga
 	     && std_dimension[i].rows >= *rows)
@@ -3465,7 +3465,7 @@
   static const char * const tempdirs[] = {
     "$TMPDIR", "$TEMP", "$TMP", "c:/"
   };
-  const int imax = EARRAYSIZE (tempdirs);
+  const int imax = ARRAYELTS (tempdirs);
 
   /* Make sure they have a usable $TMPDIR.  Many Emacs functions use
      temporary files and assume "/tmp" if $TMPDIR is unset, which

=== modified file 'src/nsfns.m'
--- src/nsfns.m	2014-04-03 07:14:02 +0000
+++ src/nsfns.m	2014-04-03 20:46:04 +0000
@@ -1024,7 +1024,7 @@
   };
 
   int i;
-  for (i = 0; i < EARRAYSIZE (r); ++i)
+  for (i = 0; i < ARRAYELTS (r); ++i)
     {
       if (NILP (Fassq (r[i].tem, parms)))
         {

=== modified file 'src/nsterm.m'
--- src/nsterm.m	2014-04-03 07:14:02 +0000
+++ src/nsterm.m	2014-04-03 20:46:04 +0000
@@ -2012,7 +2012,7 @@
     Internal call used by NSView-keyDown.
    -------------------------------------------------------------------------- */
 {
-  const unsigned last_keysym = EARRAYSIZE (convert_ns_to_X_keysym);
+  const unsigned last_keysym = ARRAYELTS (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)

=== modified file 'src/sysdep.c'
--- src/sysdep.c	2014-04-03 07:14:02 +0000
+++ src/sysdep.c	2014-04-03 20:46:04 +0000
@@ -255,7 +255,7 @@
 #endif /* not DOS_NT */
     }
 
-  baud_rate = (emacs_ospeed < EARRAYSIZE (baud_convert)
+  baud_rate = (emacs_ospeed < ARRAYELTS (baud_convert)
 	       ? baud_convert[emacs_ospeed] : 9600);
   if (baud_rate == 0)
     baud_rate = 1200;

=== modified file 'src/term.c'
--- src/term.c	2014-04-03 07:14:02 +0000
+++ src/term.c	2014-04-03 20:46:04 +0000
@@ -1339,7 +1339,7 @@
   if (!KEYMAPP (KVAR (kboard, Vinput_decode_map)))
     kset_input_decode_map (kboard, Fmake_sparse_keymap (Qnil));
 
-  for (i = 0; i < EARRAYSIZE (keys); i++)
+  for (i = 0; i < ARRAYELTS (keys); i++)
     {
       char *sequence = tgetstr (keys[i].cap, address);
       if (sequence)

=== modified file 'src/unexcw.c'
--- src/unexcw.c	2014-04-03 07:14:02 +0000
+++ src/unexcw.c	2014-04-03 20:46:04 +0000
@@ -81,7 +81,7 @@
 #endif
   assert (exe_header_buffer->file_header.f_nscns > 0);
   assert (exe_header_buffer->file_header.f_nscns <=
-          EARRAYSIZE (exe_header_buffer->section_header));
+          ARRAYELTS (exe_header_buffer->section_header));
   assert (exe_header_buffer->file_header.f_opthdr > 0);
 
   ret =

=== modified file 'src/w32.c'
--- src/w32.c	2014-04-03 07:14:02 +0000
+++ src/w32.c	2014-04-03 20:46:04 +0000
@@ -1707,7 +1707,7 @@
 /* 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 = EARRAYSIZE (samples);
+static int max_idx = ARRAYELTS (samples);
 
 static int
 buf_next (int from)
@@ -2511,7 +2511,7 @@
 
   int i;
 
-  const int imax = EARRAYSIZE (tempdirs);
+  const int imax = ARRAYELTS (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 @@
       {"LANG", NULL},
     };
 
-#define N_ENV_VARS EARRAYSIZE (dflt_envvars)
+#define N_ENV_VARS ARRAYELTS (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

=== modified file 'src/w32fns.c'
--- src/w32fns.c	2014-04-03 07:14:02 +0000
+++ src/w32fns.c	2014-04-03 20:46:04 +0000
@@ -723,7 +723,7 @@
 
   cmap = Qnil;
 
-  for (i = 0; i < EARRAYSIZE (w32_color_map); pc++, i++)
+  for (i = 0; i < ARRAYELTS (w32_color_map); pc++, i++)
     cmap = Fcons (Fcons (build_string (pc->name),
 			 make_number (pc->colorref)),
 		  cmap);

=== modified file 'src/xfaces.c'
--- src/xfaces.c	2014-04-03 07:14:02 +0000
+++ src/xfaces.c	2014-04-03 20:46:04 +0000
@@ -515,7 +515,7 @@
 
   fputc ('\n', stderr);
 
-  for (i = n = 0; i < EARRAYSIZE (color_count); ++i)
+  for (i = n = 0; i < ARRAYELTS (color_count); ++i)
     if (color_count[i])
       {
 	fprintf (stderr, "%3d: %5d", i, color_count[i]);

=== modified file 'src/xfns.c'
--- src/xfns.c	2014-04-03 07:14:02 +0000
+++ src/xfns.c	2014-04-03 20:46:04 +0000
@@ -1944,7 +1944,7 @@
 best_xim_style (XIMStyles *xim)
 {
   int i, j;
-  int nr_supported = EARRAYSIZE (supported_xim_styles);
+  int nr_supported = ARRAYELTS (supported_xim_styles);
 
   for (i = 0; i < nr_supported; ++i)
     for (j = 0; j < xim->count_styles; ++j)

=== modified file 'src/xterm.c'
--- src/xterm.c	2014-04-03 07:14:02 +0000
+++ src/xterm.c	2014-04-03 20:46:04 +0000
@@ -10103,7 +10103,7 @@
     };
 
     int i;
-    const int atom_count = EARRAYSIZE (atom_refs);
+    const int atom_count = ARRAYELTS (atom_refs);
     /* 1 for _XSETTINGS_SN  */
     const int total_atom_count = 1 + atom_count;
     Atom *atoms_return = xmalloc (total_atom_count * sizeof *atoms_return);
------------------------------------------------------------
revno: 116935
committer: Daniel Colascione <dancol@dancol.org>
branch nick: trunk
timestamp: Thu 2014-04-03 00:14:02 -0700
message:
  Clean up array size calculations
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2014-04-03 00:44:00 +0000
+++ src/ChangeLog	2014-04-03 07:14:02 +0000
@@ -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.
 

=== modified file 'src/chartab.c'
--- src/chartab.c	2013-12-01 22:33:13 +0000
+++ src/chartab.c	2014-04-03 07:14:02 +0000
@@ -1221,9 +1221,7 @@
 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 @@
     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.  */
 

=== modified file 'src/dired.c'
--- src/dired.c	2014-01-01 07:43:34 +0000
+++ src/dired.c	2014-04-03 07:14:02 +0000
@@ -984,7 +984,7 @@
   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,

=== modified file 'src/dosfns.c'
--- src/dosfns.c	2014-01-01 07:43:34 +0000
+++ src/dosfns.c	2014-04-03 07:14:02 +0000
@@ -402,7 +402,7 @@
 {
   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 @@
     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 */

=== modified file 'src/emacs.c'
--- src/emacs.c	2014-03-28 23:11:39 +0000
+++ src/emacs.c	2014-04-03 07:14:02 +0000
@@ -1817,7 +1817,7 @@
 	    }
 
 	  /* 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 @@
 
 	      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))

=== modified file 'src/fileio.c'
--- src/fileio.c	2014-03-26 15:57:13 +0000
+++ src/fileio.c	2014-04-03 07:14:02 +0000
@@ -2909,7 +2909,7 @@
     }
 #endif
 
-  return Flist (sizeof (values) / sizeof (values[0]), values);
+  return Flist (EARRAYSIZE (values), values);
 }
 
 DEFUN ("set-file-selinux-context", Fset_file_selinux_context,

=== modified file 'src/frame.c'
--- src/frame.c	2014-03-30 13:31:45 +0000
+++ src/frame.c	2014-04-03 07:14:02 +0000
@@ -2867,8 +2867,7 @@
 
 	      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 @@
 
 	  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 @@
     {
       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 @@
   {
     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)

=== modified file 'src/fringe.c'
--- src/fringe.c	2014-02-05 10:46:44 +0000
+++ src/fringe.c	2014-04-03 07:14:02 +0000
@@ -474,7 +474,7 @@
 
 #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;

=== modified file 'src/image.c'
--- src/image.c	2014-03-27 01:17:54 +0000
+++ src/image.c	2014-04-03 07:14:02 +0000
@@ -3955,9 +3955,7 @@
 {
   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;

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2014-03-26 10:21:55 +0000
+++ src/keyboard.c	2014-04-03 07:14:02 +0000
@@ -1446,7 +1446,7 @@
       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 @@
      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 @@
 				      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 @@
 				    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 @@
 				    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 @@
 				  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 @@
   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 @@
 
   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 @@
     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 @@
     }
   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 @@
 
   {
     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 @@
   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++)

=== modified file 'src/macfont.m'
--- src/macfont.m	2014-01-13 10:32:48 +0000
+++ src/macfont.m	2014-04-03 07:14:02 +0000
@@ -237,8 +237,7 @@
     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 @@
 	    {{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 @@
   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 @@
     {
       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 @@
   CTLineRef ctline = NULL;
 
   string = CFStringCreateWithCharacters (NULL, characters,
-					 sizeof (characters)
-					 / sizeof (characters[0]));
+                                         EARRAYSIZE (characters));
+
   if (string)
     {
       CTGlyphInfoRef glyph_info =
@@ -3811,7 +3810,7 @@
 
 	  attributes = CFDictionaryCreate (NULL, (const void **) keys,
 					   (const void **) values,
-					   sizeof (keys) / sizeof (keys[0]),
+                                           EARRAYSIZE (keys),
 					   &kCFTypeDictionaryKeyCallBacks,
 					   &kCFTypeDictionaryValueCallBacks);
 	  CFRelease (glyph_info);

=== modified file 'src/msdos.c'
--- src/msdos.c	2014-01-01 07:43:34 +0000
+++ src/msdos.c	2014-04-03 07:14:02 +0000
@@ -564,7 +564,7 @@
       };
       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 @@
   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

=== modified file 'src/nsfns.m'
--- src/nsfns.m	2014-02-11 18:05:01 +0000
+++ src/nsfns.m	2014-04-03 07:14:02 +0000
@@ -1024,7 +1024,7 @@
   };
 
   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)))
         {

=== modified file 'src/nsterm.m'
--- src/nsterm.m	2014-03-30 17:21:20 +0000
+++ src/nsterm.m	2014-04-03 07:14:02 +0000
@@ -2012,8 +2012,7 @@
     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)

=== modified file 'src/sysdep.c'
--- src/sysdep.c	2014-03-26 10:21:55 +0000
+++ src/sysdep.c	2014-04-03 07:14:02 +0000
@@ -255,7 +255,7 @@
 #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;

=== modified file 'src/term.c'
--- src/term.c	2014-03-25 14:43:26 +0000
+++ src/term.c	2014-04-03 07:14:02 +0000
@@ -1339,7 +1339,7 @@
   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)

=== modified file 'src/unexcw.c'
--- src/unexcw.c	2014-03-21 07:26:47 +0000
+++ src/unexcw.c	2014-04-03 07:14:02 +0000
@@ -81,8 +81,7 @@
 #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 =

=== modified file 'src/w32.c'
--- src/w32.c	2014-03-26 10:21:55 +0000
+++ src/w32.c	2014-04-03 07:14:02 +0000
@@ -1707,7 +1707,7 @@
 /* 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 @@
 
   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 @@
       {"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

=== modified file 'src/w32fns.c'
--- src/w32fns.c	2014-03-26 10:21:55 +0000
+++ src/w32fns.c	2014-04-03 07:14:02 +0000
@@ -723,8 +723,7 @@
 
   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);

=== modified file 'src/xfaces.c'
--- src/xfaces.c	2014-02-04 07:36:58 +0000
+++ src/xfaces.c	2014-04-03 07:14:02 +0000
@@ -515,7 +515,7 @@
 
   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]);

=== modified file 'src/xfns.c'
--- src/xfns.c	2014-03-23 11:44:21 +0000
+++ src/xfns.c	2014-04-03 07:14:02 +0000
@@ -1944,8 +1944,7 @@
 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)

=== modified file 'src/xterm.c'
--- src/xterm.c	2014-04-02 16:17:08 +0000
+++ src/xterm.c	2014-04-03 07:14:02 +0000
@@ -10103,7 +10103,7 @@
     };
 
     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);