gnulib: update

[bison.git] / lib / bitsetv-print.c

diff --git a/lib/bitsetv-print.c b/lib/bitsetv-print.c
index 4ecbb2a04fabf7e7b0a54365d82c9b820d790401..92b617eccdef7584bd59ffbde718033be47a4eea 100644 (file)
--- a/lib/bitsetv-print.c
+++ b/lib/bitsetv-print.c
@@ -1,30 +1,27 @@
 /* Bitset vectors.
-   Copyright (C) 2001 Free Software Foundation, Inc.
 
-This file is part of Bison.
+   Copyright (C) 2001-2002, 2004, 2006, 2009-2012 Free Software
+   Foundation, Inc.
 
-Bison is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-Bison is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <stdlib.h>
 #include "bitsetv-print.h"
 
+#include <stdlib.h>
+
 /*--------------------------------------------------------.
 | Display the MATRIX array of SIZE bitsets of size SIZE.  |
 `--------------------------------------------------------*/
@@ -32,8 +29,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 void
 bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset)
 {
-  size_t i, j;
-  size_t hsize = bitset_size (bset[0]);
+  bitset_bindex i, j;
+  bitset_bindex hsize = bitset_size (bset[0]);
 
   /* Title. */
   fprintf (out, "%s BEGIN\n", title);
@@ -45,7 +42,7 @@ bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset)
   putc ('\n', out);
   fputs ("   ", out);
   for (i = 0; i < hsize; ++i)
-    fprintf (out, "%d", i % 10);
+    fprintf (out, "%d", (int) (i % 10));
   putc ('\n', out);
 
   /* Bar. */
@@ -57,7 +54,7 @@ bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset)
   /* Contents. */
   for (i = 0; bset[i]; ++i)
     {
-      fprintf (out, "%2d|", i);
+      fprintf (out, "%2lu|", (unsigned long int) i);
       for (j = 0; j < hsize; ++j)
        fputs (bitset_test (bset[i], j) ? "1" : " ", out);
       fputs ("|\n", out);