X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a737b2163c275761f32589bf7c249016452bb730..e34e97bcd736ab3193bfd3abd4162db3b159836d:/src/uniqstr.c?ds=sidebyside
diff --git a/src/uniqstr.c b/src/uniqstr.c
index fb316cb3..62d09ca9 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,29 +1,29 @@
/* Keep a unique copy of strings.
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002-2005, 2009-2012 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ 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,
+ 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, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
+#include
#include "system.h"
#include
#include
#include
+#include
#include "uniqstr.h"
@@ -48,11 +48,27 @@ uniqstr_new (char const *str)
{
/* First insertion in the hash. */
res = xstrdup (str);
- hash_insert (uniqstrs_table, res);
+ if (!hash_insert (uniqstrs_table, res))
+ xalloc_die ();
}
return res;
}
+uniqstr
+uniqstr_vsprintf (char const *format, ...)
+{
+ va_list args;
+ size_t length;
+ va_start (args, format);
+ length = vsnprintf (NULL, 0, format, args);
+ va_end (args);
+
+ char res[length + 1];
+ va_start (args, format);
+ vsprintf (res, format, args);
+ va_end (args);
+ return uniqstr_new (res);
+}
/*------------------------------.
| Abort if S is not a uniqstr. |
@@ -63,7 +79,8 @@ uniqstr_assert (char const *str)
{
if (!hash_lookup (uniqstrs_table, str))
{
- error (0, 0, "not a uniqstr: %s", quotearg (str));
+ error (0, 0,
+ "not a uniqstr: %s", quotearg (str));
abort ();
}
}
@@ -97,8 +114,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);
}