warnings: fusion of complain and complain_at

[bison.git] / src / uniqstr.c

diff --git a/src/uniqstr.c b/src/uniqstr.c
index f21d46f021b527ccae854d369ccf207a7739ca4b..f2954443e9c9e9a3140fd9766f5905d38d3f050c 100644 (file)
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.
 
 /* Keep a unique copy of strings.
 

-   Copyright (C) 2002-2005, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2012 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -80,7 +80,7 @@ uniqstr_assert (char const *str)
   if (!hash_lookup (uniqstrs_table, str))
     {
       error (0, 0,
   if (!hash_lookup (uniqstrs_table, str))
     {
       error (0, 0,

-            "not a uniqstr: %s", quotearg (str));
+             "not a uniqstr: %s", quotearg (str));

       abort ();
     }
 }
       abort ();
     }
 }


@@ -111,7 +111,7 @@ uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
 static bool
 hash_compare_uniqstr (void const *m1, void const *m2)
 {
 static bool
 hash_compare_uniqstr (void const *m1, void const *m2)
 {

-  return strcmp (m1, m2) == 0;
+  return STREQ (m1, m2);

 }
 
 static size_t
 }
 
 static size_t


@@ -128,10 +128,10 @@ void
 uniqstrs_new (void)
 {
   uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,
 uniqstrs_new (void)
 {
   uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,

-                                   NULL,
-                                   hash_uniqstr,
-                                   hash_compare_uniqstr,
-                                   free);
+                                    NULL,
+                                    hash_uniqstr,
+                                    hash_compare_uniqstr,
+                                    free);

 }
 
 
 }