projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document semicolon warnings.
[bison.git]
/
src
/
uniqstr.c
diff --git
a/src/uniqstr.c
b/src/uniqstr.c
index c93157d7b5a059780da149e0af5b1f2f86ba3990..644477bed20a89801e5782082c3ccbc245cd4712 100644
(file)
--- a/
src/uniqstr.c
+++ b/
src/uniqstr.c
@@
-1,24
+1,23
@@
/* Keep a unique copy of strings.
/* 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.
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
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
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 <http://www.gnu.org/licenses/>. */
+#include <config.h>
#include "system.h"
#include <error.h>
#include "system.h"
#include <error.h>
@@
-41,13
+40,13
@@
static struct hash_table *uniqstrs_table = NULL;
`-------------------------------------*/
uniqstr
`-------------------------------------*/
uniqstr
-uniqstr_new (char const *s)
+uniqstr_new (char const *s
tr
)
{
{
- uniqstr res = hash_lookup (uniqstrs_table, s);
+ uniqstr res = hash_lookup (uniqstrs_table, s
tr
);
if (!res)
{
/* First insertion in the hash. */
if (!res)
{
/* First insertion in the hash. */
- res = xstrdup (s);
+ res = xstrdup (s
tr
);
hash_insert (uniqstrs_table, res);
}
return res;
hash_insert (uniqstrs_table, res);
}
return res;
@@
-59,11
+58,12
@@
uniqstr_new (char const *s)
`------------------------------*/
void
`------------------------------*/
void
-uniqstr_assert (char const *s)
+uniqstr_assert (char const *s
tr
)
{
{
- if (!hash_lookup (uniqstrs_table, s))
+ if (!hash_lookup (uniqstrs_table, s
tr
))
{
{
- error (0, 0, "not a uniqstr: %s", quotearg (s));
+ error (0, 0,
+ "not a uniqstr: %s", quotearg (str));
abort ();
}
}
abort ();
}
}
@@
-74,16
+74,16
@@
uniqstr_assert (char const *s)
`--------------------*/
static inline bool
`--------------------*/
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
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
}
\f
@@
-97,8
+97,8
@@
hash_compare_uniqstr (void const *m1, void const *m2)
return strcmp (m1, m2) == 0;
}
return strcmp (m1, m2) == 0;
}
-static
unsigned in
t
-hash_uniqstr (void const *m,
unsigned in
t tablesize)
+static
size_
t
+hash_uniqstr (void const *m,
size_
t tablesize)
{
return hash_string (m, tablesize);
}
{
return hash_string (m, tablesize);
}