? client/options.c.pdz
? server/stdinhand.c.pdz
Index: client/options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.40
diff -u -r1.40 options.c
--- client/options.c	2001/07/04 11:24:19	1.40
+++ client/options.c	2001/09/06 19:39:08
@@ -189,7 +189,7 @@
   for(i=0; i<E_LAST; i++) {
     messages_where[i] = MW_OUTPUT | MW_MESSAGES;
   }
-  for(i=0; i<sizeof(out_only)/sizeof(int); i++) {
+  for(i=0; i<ARRAY_SIZE(out_only); i++) {
     messages_where[out_only[i]] = MW_OUTPUT;
   }
   
Index: client/gui-gtk/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/menu.c,v
retrieving revision 1.56
diff -u -r1.56 menu.c
--- client/gui-gtk/menu.c	2001/08/24 06:54:29	1.56
+++ client/gui-gtk/menu.c	2001/09/06 19:39:09
@@ -831,7 +831,7 @@
 *****************************************************************/
 void setup_menus(GtkWidget *window, GtkWidget **menubar)
 {
-  const int nmenu_items = sizeof(menu_items)/sizeof(menu_items[0]);
+  const int nmenu_items = ARRAY_SIZE(menu_items);
   GtkAccelGroup *accel;
   int i;
 
Index: client/gui-gtk/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/repodlgs.c,v
retrieving revision 1.38
diff -u -r1.38 repodlgs.c
--- client/gui-gtk/repodlgs.c	2001/07/06 12:53:50	1.38
+++ client/gui-gtk/repodlgs.c	2001/09/06 19:39:09
@@ -1034,7 +1034,7 @@
     gtk_clist_freeze(GTK_CLIST(activeunits_list));
     gtk_clist_clear(GTK_CLIST(activeunits_list));
 
-    for(i=0;i<(sizeof(row)/sizeof(row[0]));i++)
+    for(i=0;i<ARRAY_SIZE(row);i++)
       row[i] = buf[i];
 
     memset(unitarray, '\0', sizeof(unitarray));
Index: client/gui-win32/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/menu.c,v
retrieving revision 1.1
diff -u -r1.1 menu.c
--- client/gui-win32/menu.c	2001/09/04 19:09:37	1.1
+++ client/gui-win32/menu.c	2001/09/06 19:39:09
@@ -210,7 +210,7 @@
    
   if (!accelcount) {
     
-    for(;accelcount<sizeof(numpadaccel)/sizeof(ACCEL);accelcount++)
+    for(;accelcount<ARRAY_SIZE(numpadaccel);accelcount++)
       menuaccel[accelcount]=numpadaccel[accelcount];
   }
  
Index: client/gui-win32/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/repodlgs.c,v
retrieving revision 1.1
diff -u -r1.1 repodlgs.c
--- client/gui-win32/repodlgs.c	2001/09/04 19:09:38	1.1
+++ client/gui-win32/repodlgs.c	2001/09/06 19:39:09
@@ -643,7 +643,7 @@
     SetWindowText(GetDlgItem(activeunits_dlg,ID_MILITARY_TOP),report_title);
     lv=GetDlgItem(activeunits_dlg,ID_MILITARY_LIST);
     ListView_DeleteAllItems(lv);
-    for(i=0;i<(sizeof(row)/sizeof(row[0]));i++)
+    for(i=0;i<ARRAY_SIZE(row);i++)
       row[i] = buf[i];
 
     memset(unitarray, '\0', sizeof(unitarray));
Index: common/events.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/events.h,v
retrieving revision 1.17
diff -u -r1.17 events.h
--- common/events.h	2001/07/04 11:24:21	1.17
+++ common/events.h	2001/09/06 19:39:09
@@ -60,6 +60,7 @@
   E_CITY_WONDER_WILL_BE_BUILT,
   E_NEW_GOVERNMENT,
   E_CITY_NUKED,
+  E_MESSAGE_WALL,
   /* Note:  If you add a new event, make sure you make a similar change to
      message_text in client/options.c
      */
Index: common/government.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/government.c,v
retrieving revision 1.22
diff -u -r1.22 government.c
--- common/government.c	2001/08/30 13:00:14	1.22
+++ common/government.c	2001/09/06 19:39:09
@@ -78,7 +78,7 @@
 {
   enum government_flag_id i;
 
-  assert(sizeof(flag_names)/sizeof(char*)==G_LAST_FLAG);
+  assert(ARRAY_SIZE(flag_names)==G_LAST_FLAG);
   
   for(i=G_FIRST_FLAG; i<G_LAST_FLAG; i++) {
     if (mystrcasecmp(flag_names[i], s)==0) {
@@ -106,7 +106,7 @@
 {
   enum government_hint_id i;
 
-  assert(sizeof(hint_names)/sizeof(char*)==G_LAST_HINT);
+  assert(ARRAY_SIZE(hint_names)==G_LAST_HINT);
   
   for(i=G_FIRST_HINT; i<G_LAST_HINT; i++) {
     if (mystrcasecmp(hint_names[i], s)==0) {
Index: common/hash.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/hash.c,v
retrieving revision 1.8
diff -u -r1.8 hash.c
--- common/hash.c	2001/09/02 10:24:27	1.8
+++ common/hash.c	2001/09/06 19:39:09
@@ -95,6 +95,7 @@
 
 #include "log.h"
 #include "mem.h"
+#include "shared.h" /* ARRAY_SIZE */
 
 #include "hash.h"
 
@@ -233,7 +234,7 @@
   12582917,  25165843,  50331653,   100663319,    201326611, 
   402653189, 805306457, 1610612741, 3221225473ul, 4294967291ul
 };
-#define NSIZES (sizeof(ht_sizes)/sizeof(ht_sizes[0]))
+#define NSIZES (ARRAY_SIZE(ht_sizes))
 
 /**************************************************************************
   Calculate a "reasonable" number of buckets for a given number of
Index: common/improvement.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/improvement.c,v
retrieving revision 1.5
diff -u -r1.5 improvement.c
--- common/improvement.c	2001/08/25 20:30:56	1.5
+++ common/improvement.c	2001/09/06 19:39:09
@@ -17,6 +17,7 @@
 #include "map.h"
 #include "support.h"
 #include "tech.h"
+#include "shared.h" /* ARRAY_SIZE */
 
 #include "improvement.h"
 
@@ -126,7 +127,7 @@
 {
   Eff_Range_id ret_id;
 
-  assert(sizeof(effect_range_names)/sizeof(effect_range_names[0])==EFR_LAST);
+  assert(ARRAY_SIZE(effect_range_names)==EFR_LAST);
 
   for (ret_id = 0; ret_id < EFR_LAST; ret_id++) {
     if (0 == mystrcasecmp(effect_range_names[ret_id], str)) {
@@ -142,7 +143,7 @@
 **************************************************************************/
 const char *effect_range_name(Eff_Range_id id)
 {
-  assert(sizeof(effect_range_names)/sizeof(effect_range_names[0])==EFR_LAST);
+  assert(ARRAY_SIZE(effect_range_names)==EFR_LAST);
 
   if (id < EFR_LAST) {
     return effect_range_names[id];
@@ -159,7 +160,7 @@
 {
   Eff_Type_id ret_id;
 
-  assert(sizeof(effect_type_names)/sizeof(effect_type_names[0])==EFT_LAST);
+  assert(ARRAY_SIZE(effect_type_names)==EFT_LAST);
 
   for (ret_id = 0; ret_id < EFT_LAST; ret_id++) {
     if (0 == mystrcasecmp(effect_type_names[ret_id], str)) {
@@ -175,7 +176,7 @@
 **************************************************************************/
 const char *effect_type_name(Eff_Type_id id)
 {
-  assert(sizeof(effect_type_names)/sizeof(effect_type_names[0])==EFT_LAST);
+  assert(ARRAY_SIZE(effect_type_names)==EFT_LAST);
 
   if (id < EFT_LAST) {
     return effect_type_names[id];
Index: common/map.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/map.c,v
retrieving revision 1.82
diff -u -r1.82 map.c
--- common/map.c	2001/08/26 09:28:16	1.82
+++ common/map.c	2001/09/06 19:39:09
@@ -261,7 +261,7 @@
   enum tile_special_type st = 1;
 
   for (inx = 0;
-       inx < sizeof(tile_special_type_names)/sizeof(tile_special_type_names[0]);
+       inx < ARRAY_SIZE(tile_special_type_names);
        inx++) {
     if (0 == strcmp(name, tile_special_type_names[inx])) {
       return st;
@@ -280,7 +280,7 @@
   int inx;
 
   for (inx = 0;
-       inx < sizeof(tile_special_type_names)/sizeof(tile_special_type_names[0]);
+       inx < ARRAY_SIZE(tile_special_type_names);
        inx++) {
     if (type & 0x1) {
       return tile_special_type_names[inx];
Index: common/shared.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/shared.c,v
retrieving revision 1.64
diff -u -r1.64 shared.c
--- common/shared.c	2001/08/13 15:13:35	1.64
+++ common/shared.c	2001/09/06 19:39:09
@@ -809,7 +809,7 @@
     N_("too long"),
     N_("non-match")
   };
-  assert(result >= 0 && result < sizeof(descriptions)/sizeof(descriptions[0]));
+  assert(result >= 0 && result < ARRAY_SIZE(descriptions));
   return descriptions[result];
 }
 
Index: common/shared.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/shared.h,v
retrieving revision 1.85
diff -u -r1.85 shared.h
--- common/shared.h	2000/09/22 07:24:24	1.85
+++ common/shared.h	2001/09/06 19:39:09
@@ -57,6 +57,8 @@
 /* This is duplicated in rand.h to avoid extra includes: */
 #define MAX_UINT32 0xFFFFFFFF
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
 char *create_centered_string(char *s);
 
 char * get_option(const char *option_name,char **argv,int *i,int argc);
Index: common/tech.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/tech.c,v
retrieving revision 1.28
diff -u -r1.28 tech.c
--- common/tech.c	2001/09/02 13:37:58	1.28
+++ common/tech.c	2001/09/06 19:39:09
@@ -18,6 +18,7 @@
 #include "game.h"
 #include "player.h"
 #include "support.h"
+#include "shared.h" /* ARRAY_SIZE */
 
 #include "tech.h"
 
@@ -190,7 +191,7 @@
 {
   enum tech_flag_id i;
 
-  assert(sizeof(flag_names)/sizeof(char*)==TF_LAST);
+  assert(ARRAY_SIZE(flag_names)==TF_LAST);
   
   for(i=0; i<TF_LAST; i++) {
     if (mystrcasecmp(flag_names[i], s)==0) {
Index: common/unittype.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/unittype.c,v
retrieving revision 1.4
diff -u -r1.4 unittype.c
--- common/unittype.c	2001/08/28 13:45:35	1.4
+++ common/unittype.c	2001/09/06 19:39:09
@@ -25,6 +25,7 @@
 #include "player.h"
 #include "support.h"
 #include "tech.h"
+#include "shared.h" /* ARRAY_SIZE */
 
 #include "unittype.h"
 
@@ -326,7 +327,7 @@
   enum unit_move_type i;
 
   /* a compile-time check would be nicer, but this will do: */
-  assert(sizeof(move_type_names)/sizeof(char*)==AIR_MOVING-LAND_MOVING+1);
+  assert(ARRAY_SIZE(move_type_names)==AIR_MOVING-LAND_MOVING+1);
 
   for(i=LAND_MOVING; i<=AIR_MOVING; i++) {
     if (mystrcasecmp(move_type_names[i-LAND_MOVING], s)==0) {
@@ -344,7 +345,7 @@
 {
   Unit_Class_id i;
 
-  assert(sizeof(unit_class_names)/sizeof(unit_class_names[0])==UCL_LAST);
+  assert(ARRAY_SIZE(unit_class_names)==UCL_LAST);
 
   for (i = 0; i < UCL_LAST; i++) {
     if (mystrcasecmp(unit_class_names[i], s)==0) {
@@ -362,7 +363,7 @@
 {
   enum unit_flag_id i;
 
-  assert(sizeof(flag_names)/sizeof(char*)==F_LAST);
+  assert(ARRAY_SIZE(flag_names)==F_LAST);
   
   for(i=0; i<F_LAST; i++) {
     if (mystrcasecmp(flag_names[i], s)==0) {
@@ -380,7 +381,7 @@
 {
   enum unit_role_id i;
 
-  assert(sizeof(role_names)/sizeof(char*)==L_LAST-L_FIRST);
+  assert(ARRAY_SIZE(role_names)==L_LAST-L_FIRST);
   
   for(i=L_FIRST; i<L_LAST; i++) {
     if (mystrcasecmp(role_names[i-L_FIRST], s)==0) {
Index: intl/plural.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/intl/plural.c,v
retrieving revision 1.1
diff -u -r1.1 plural.c
--- intl/plural.c	2001/06/15 23:12:57	1.1
+++ intl/plural.c	2001/09/06 19:39:09
@@ -993,7 +993,7 @@
 	  count = 0;
 	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
 	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
+	       x < ARRAY_SIZE(yytname); x++)
 	    if (yycheck[x + yyn] == x)
 	      size += strlen(yytname[x]) + 15, count++;
 	  msg = (char *) malloc(size + 15);
@@ -1005,7 +1005,7 @@
 		{
 		  count = 0;
 		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
+		       x < ARRAY_SIZE(yytname) ; x++)
 		    if (yycheck[x + yyn] == x)
 		      {
 			strcat(msg, count == 0 ? ", expecting `" : " or `");
Index: server/report.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/report.c,v
retrieving revision 1.10
diff -u -r1.10 report.c
--- server/report.c	2001/08/24 08:22:10	1.10
+++ server/report.c	2001/09/06 19:39:09
@@ -128,7 +128,7 @@
 		 get_nation_name_plural(game.players[size[i].idx].nation));
   }
   free(size);
-  which_historian=myrand(sizeof(historian_name)/sizeof(historian_name[0]));
+  which_historian=myrand(ARRAY_SIZE(historian_name));
   my_snprintf(title, sizeof(title), _(historian_message[which_news]),
     _(historian_name[which_historian]));
   page_conn_etype(&game.game_connections, _("Historian Publishes!"),
@@ -901,7 +901,7 @@
 
   anyrows = FALSE;
   selcols = DEM_NONE;
-  for (inx = 0; inx < (sizeof (keytable) / sizeof (keytable[0])); inx++)
+  for (inx = 0; inx < ARRAY_SIZE(keytable); inx++)
     {
       if (strchr (game.demography, keytable[inx].key))
 	{
@@ -928,7 +928,7 @@
 	       get_government_name (pplayer->government),
 	       get_nation_name_plural (pplayer->nation));
 
-  for (inx = 0; inx < (sizeof (keytable) / sizeof (keytable[0])); inx++)
+  for (inx = 0; inx < ARRAY_SIZE(keytable); inx++)
     {
       if ((strchr (game.demography, keytable[inx].key)) &&
 	  (keytable[inx].flag == DEM_ROW))
Index: server/rulesout.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/rulesout.c,v
retrieving revision 1.3
diff -u -r1.3 rulesout.c
--- server/rulesout.c	2000/08/31 13:32:49	1.3
+++ server/rulesout.c	2001/09/06 19:39:09
@@ -151,7 +151,7 @@
   }
   
   /* Flags: */
-  for(j=0; j<sizeof(tech_flag_desc)/sizeof(tech_flag_desc[0]); j++) {
+  for(j=0; j<ARRAY_SIZE(tech_flag_desc); j++) {
     if (tech_flag(itech, j)) {
       strcpy(buf, "special: ");
       sz_strlcat(buf, _(tech_flag_desc[j]));
Index: server/stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.189
diff -u -r1.189 stdinhand.c
--- server/stdinhand.c	2001/09/02 13:38:00	1.189
+++ server/stdinhand.c	2001/09/06 19:39:09
@@ -808,7 +808,7 @@
     NULL, NULL }
 };
 
-#define SETTINGS_NUM ((sizeof(settings)/sizeof(settings[0]))-1)
+#define SETTINGS_NUM (ARRAY_SIZE(settings)-1)
 
 /********************************************************************
 Returns whether the specified server setting (option) can currently
Index: server/unittools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unittools.c,v
retrieving revision 1.135
diff -u -r1.135 unittools.c
--- server/unittools.c	2001/09/02 13:38:00	1.135
+++ server/unittools.c	2001/09/06 19:39:09
@@ -686,7 +686,7 @@
     B_OFFSHORE
   };
   #define coastal_improvements_count \
-    (sizeof(coastal_improvements)/sizeof(coastal_improvements[0]))
+    (ARRAY_SIZE(coastal_improvements))