tests: portability fixes.

[bison.git] / lib / bitset_stats.c

diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c
index 48cf5c747f1223d90839bc0061ce32e5614ce6df..bde9b98848109f24a042cce8c1dad53fea9f02d2 100644 (file)
--- a/lib/bitset_stats.c
+++ b/lib/bitset_stats.c
@@ -1,10 +1,12 @@
 /* Bitset statistics.
 /* Bitset statistics.

-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc.
+

    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -13,28 +15,24 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* This file is a wrapper bitset implementation for the other bitset
    implementations.  It provides bitset compatibility checking and
    statistics gathering without having to instrument the bitset
    implementations.  When statistics gathering is enabled, the bitset
    operations get vectored through here and we then call the appropriate
 
 /* This file is a wrapper bitset implementation for the other bitset
    implementations.  It provides bitset compatibility checking and
    statistics gathering without having to instrument the bitset
    implementations.  When statistics gathering is enabled, the bitset
    operations get vectored through here and we then call the appropriate

-   routines.
-*/
+   routines.  */
+
+#include <config.h>

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "bitset_stats.h"

 
 #include "bbitset.h"
 #include "abitset.h"
 #include "ebitset.h"
 #include "lbitset.h"
 #include "vbitset.h"
 
 #include "bbitset.h"
 #include "abitset.h"
 #include "ebitset.h"
 #include "lbitset.h"
 #include "vbitset.h"

-#include "bitset_stats.h"

 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>


@@ -50,29 +48,29 @@
 
 
 /* Accessor macros.  */
 
 
 /* Accessor macros.  */

-#define BITSET_STATS_ALLOCS_INC(TYPE)                  \
+#define BITSET_STATS_ALLOCS_INC(TYPE)                  \

     bitset_stats_info->types[(TYPE)].allocs++
     bitset_stats_info->types[(TYPE)].allocs++

-#define BITSET_STATS_FREES_INC(BSET)                   \
+#define BITSET_STATS_FREES_INC(BSET)                   \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].frees++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].frees++

-#define BITSET_STATS_SETS_INC(BSET)                    \
+#define BITSET_STATS_SETS_INC(BSET)                    \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].sets++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].sets++

-#define BITSET_STATS_CACHE_SETS_INC(BSET)              \
+#define BITSET_STATS_CACHE_SETS_INC(BSET)              \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_sets++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_sets++

-#define BITSET_STATS_RESETS_INC(BSET)                  \
+#define BITSET_STATS_RESETS_INC(BSET)                  \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].resets++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].resets++

-#define BITSET_STATS_CACHE_RESETS_INC(BSET)            \
+#define BITSET_STATS_CACHE_RESETS_INC(BSET)            \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_resets++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_resets++

-#define BITSET_STATS_TESTS_INC(BSET)                   \
+#define BITSET_STATS_TESTS_INC(BSET)                   \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].tests++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].tests++

-#define BITSET_STATS_CACHE_TESTS_INC(BSET)             \
+#define BITSET_STATS_CACHE_TESTS_INC(BSET)             \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_tests++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_tests++

-#define BITSET_STATS_LISTS_INC(BSET)                   \
+#define BITSET_STATS_LISTS_INC(BSET)                   \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].lists++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].lists++

-#define BITSET_STATS_LIST_COUNTS_INC(BSET, I)          \
+#define BITSET_STATS_LIST_COUNTS_INC(BSET, I)          \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_counts[(I)]++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_counts[(I)]++

-#define BITSET_STATS_LIST_SIZES_INC(BSET, I)           \
+#define BITSET_STATS_LIST_SIZES_INC(BSET, I)           \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_sizes[(I)]++
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_sizes[(I)]++

-#define BITSET_STATS_LIST_DENSITY_INC(BSET, I)                 \
+#define BITSET_STATS_LIST_DENSITY_INC(BSET, I)         \

     bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_density[(I)]++
 
 
     bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_density[(I)]++
 
 


@@ -241,29 +239,29 @@ bitset_stats_disable (void)
 
 /* Read bitset statistics file.  */
 void
 
 /* Read bitset statistics file.  */
 void

-bitset_stats_read (const char *filename)
+bitset_stats_read (const char *file_name)

 {
   FILE *file;
 
   if (!bitset_stats_info)
     return;
 
 {
   FILE *file;
 
   if (!bitset_stats_info)
     return;
 

-  if (!filename)
-    filename = BITSET_STATS_FILE;
+  if (!file_name)
+    file_name = BITSET_STATS_FILE;

 
 

-  file = fopen (filename, "r");
+  file = fopen (file_name, "r");

   if (file)
     {
       if (fread (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
   if (file)
     {
       if (fread (&bitset_stats_info_data, sizeof (bitset_stats_info_data),

-                1, file) != 1)
-       {
-         if (ferror (file))
-           perror (_("Could not read stats file."));
-         else
-           fprintf (stderr, _("Bad stats file size.\n"));
-       }
+                 1, file) != 1)
+        {
+          if (ferror (file))
+            perror (_("cannot read stats file"));
+          else
+            fprintf (stderr, _("bad stats file size\n"));
+        }

       if (fclose (file) != 0)
       if (fclose (file) != 0)

-       perror (_("Could not read stats file."));
+        perror (_("cannot read stats file"));

     }
   bitset_stats_info_data.runs++;
 }
     }
   bitset_stats_info_data.runs++;
 }


@@ -271,27 +269,27 @@ bitset_stats_read (const char *filename)
 
 /* Write bitset statistics file.  */
 void
 
 /* Write bitset statistics file.  */
 void

-bitset_stats_write (const char *filename)
+bitset_stats_write (const char *file_name)

 {
   FILE *file;
 
   if (!bitset_stats_info)
     return;
 
 {
   FILE *file;
 
   if (!bitset_stats_info)
     return;
 

-  if (!filename)
-    filename = BITSET_STATS_FILE;
+  if (!file_name)
+    file_name = BITSET_STATS_FILE;

 
 

-  file = fopen (filename, "w");
+  file = fopen (file_name, "w");

   if (file)
     {
       if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
   if (file)
     {
       if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),

-                 1, file) != 1)
-       perror (_("Could not write stats file."));
+                  1, file) != 1)
+        perror (_("cannot write stats file"));

       if (fclose (file) != 0)
       if (fclose (file) != 0)

-       perror (_("Could not write stats file."));
+        perror (_("cannot write stats file"));

     }
   else
     }
   else

-    perror (_("Could not open stats file for writing."));
+    perror (_("cannot open stats file for writing"));

 }
 
 
 }
 
 


@@ -578,11 +576,9 @@ bitset_stats_list (bitset bset, bitset_bindex *list,
   bitset_bindex tmp;
   bitset_bindex size;
   bitset_bindex i;
   bitset_bindex tmp;
   bitset_bindex size;
   bitset_bindex i;

-  enum bitset_type type;

 
   count = BITSET_LIST_ (bset->s.bset, list, num, next);
 
 
   count = BITSET_LIST_ (bset->s.bset, list, num, next);
 

-  type = BITSET_TYPE_ (bset->s.bset);

   BITSET_STATS_LISTS_INC (bset->s.bset);
 
   /* Log histogram of number of set bits.  */
   BITSET_STATS_LISTS_INC (bset->s.bset);
 
   /* Log histogram of number of set bits.  */


@@ -696,32 +692,32 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
      we are a wrapper over.  */
   switch (type)
     {
      we are a wrapper over.  */
   switch (type)
     {

+    default:
+      abort ();
+

     case BITSET_ARRAY:
       bytes = abitset_bytes (n_bits);
     case BITSET_ARRAY:
       bytes = abitset_bytes (n_bits);

-      sbset = (bitset) xcalloc (1, bytes);
+      sbset = xcalloc (1, bytes);

       abitset_init (sbset, n_bits);
       break;
 
     case BITSET_LIST:
       bytes = lbitset_bytes (n_bits);
       abitset_init (sbset, n_bits);
       break;
 
     case BITSET_LIST:
       bytes = lbitset_bytes (n_bits);

-      sbset = (bitset) xcalloc (1, bytes);
+      sbset = xcalloc (1, bytes);

       lbitset_init (sbset, n_bits);
       break;
 
     case BITSET_TABLE:
       bytes = ebitset_bytes (n_bits);
       lbitset_init (sbset, n_bits);
       break;
 
     case BITSET_TABLE:
       bytes = ebitset_bytes (n_bits);

-      sbset = (bitset) xcalloc (1, bytes);
+      sbset = xcalloc (1, bytes);

       ebitset_init (sbset, n_bits);
       break;
 
     case BITSET_VARRAY:
       bytes = vbitset_bytes (n_bits);
       ebitset_init (sbset, n_bits);
       break;
 
     case BITSET_VARRAY:
       bytes = vbitset_bytes (n_bits);

-      sbset = (bitset) xcalloc (1, bytes);
+      sbset = xcalloc (1, bytes);

       vbitset_init (sbset, n_bits);
       break;
       vbitset_init (sbset, n_bits);
       break;

-
-    default:
-      abort ();

     }
 
   bset->s.bset = sbset;
     }
 
   bset->s.bset = sbset;