2006-10-08 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / uniqstr.c

diff --git a/src/uniqstr.c b/src/uniqstr.c
index c93157d7b5a059780da149e0af5b1f2f86ba3990..8804a80e0e96c9d094f78e77caab8a6f493836b7 100644 (file)
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -16,9 +16,10 @@
 
    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, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
+#include <config.h>
 #include "system.h"
 
 #include <error.h>
@@ -41,13 +42,13 @@ static struct hash_table *uniqstrs_table = NULL;
 `-------------------------------------*/
 
 uniqstr
-uniqstr_new (char const *s)
+uniqstr_new (char const *str)
 {
-  uniqstr res = hash_lookup (uniqstrs_table, s);
+  uniqstr res = hash_lookup (uniqstrs_table, str);
   if (!res)
     {
       /* First insertion in the hash. */
-      res = xstrdup (s);
+      res = xstrdup (str);
       hash_insert (uniqstrs_table, res);
     }
   return res;
@@ -59,11 +60,12 @@ uniqstr_new (char const *s)
 `------------------------------*/
 
 void
-uniqstr_assert (char const *s)
+uniqstr_assert (char const *str)
 {
-  if (!hash_lookup (uniqstrs_table, s))
+  if (!hash_lookup (uniqstrs_table, str))
     {
-      error (0, 0, "not a uniqstr: %s", quotearg (s));
+      error (0, 0,
+            "not a uniqstr: %s", quotearg (str));
       abort ();
     }
 }
@@ -74,16 +76,16 @@ uniqstr_assert (char const *s)
 `--------------------*/
 
 static inline bool
-uniqstr_print (uniqstr s)
+uniqstr_print (uniqstr ustr)
 {
-  fprintf (stderr, "%s\n", s);
+  fprintf (stderr, "%s\n", ustr);
   return true;
 }
 
 static bool
-uniqstr_print_processor (void *s, void *null ATTRIBUTE_UNUSED)
+uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
 {
-  return uniqstr_print (s);
+  return uniqstr_print (ustr);
 }
 
 \f
@@ -97,8 +99,8 @@ hash_compare_uniqstr (void const *m1, void const *m2)
   return strcmp (m1, m2) == 0;
 }
 
-static unsigned int
-hash_uniqstr (void const *m, unsigned int tablesize)
+static size_t
+hash_uniqstr (void const *m, size_t tablesize)
 {
   return hash_string (m, tablesize);
 }