[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04-fyi-gcc-warnings.patch
From: |
Akim Demaille |
Subject: |
04-fyi-gcc-warnings.patch |
Date: |
Mon, 10 Dec 2001 09:35:34 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
Clean up GCC warnings.
* src/reader.c (copy_action): `buf' is not used.
(parse_skel_decl): Be static.
* src/muscle_tab.c (mhash1, mhash2, muscle_insert): Preserve `const'.
* src/options.h (create_long_option_table): Have a real prototype.
* lib/hash.c, lib/hash.h (hash_insert, hash_insert_at, hash_delete)
(hash_delete_at): Return const void *.
Adjust casts to preserve the const.
Index: lib/hash.c
--- lib/hash.c Sat, 08 Dec 2001 13:39:27 +0100 akim
+++ lib/hash.c Sat, 08 Dec 2001 14:06:40 +0100 akim
@@ -1,5 +1,5 @@
/* hash.c -- hash table maintenance
- Copyright (C) 1995 Free Software Foundation, Inc.
+ Copyright 1995, 2001 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
@@ -120,17 +120,17 @@
return ((HASH_VACANT (*slot)) ? 0 : *slot);
}
-void *
+const void *
hash_insert (struct hash_table* ht, void *item)
{
void **slot = hash_find_slot (ht, item);
return hash_insert_at (ht, item, slot);
}
-void *
+const void *
hash_insert_at (struct hash_table* ht, void *item, void const *slot)
{
- void *old_item = *(void **) slot;
+ const void *old_item = *(const void **) slot;
if (HASH_VACANT (old_item))
{
ht->ht_fill++;
@@ -142,17 +142,17 @@
return old_item;
}
-void *
+const void *
hash_delete (struct hash_table* ht, void const *item)
{
void **slot = hash_find_slot (ht, item);
return hash_delete_at (ht, slot);
}
-void *
+const void *
hash_delete_at (struct hash_table* ht, void const *slot)
{
- void *item = *(void **) slot;
+ const void *item = *(const void **) slot;
if (!HASH_VACANT (item))
{
*(void const **) slot = hash_deleted_item;
Index: lib/hash.h
--- lib/hash.h Sat, 08 Dec 2001 13:39:27 +0100 akim
+++ lib/hash.h Sat, 08 Dec 2001 14:06:49 +0100 akim
@@ -1,5 +1,5 @@
/* hash.h -- decls for hash table
- Copyright (C) 1995 Free Software Foundation, Inc.
+ Copyright 1995, 2001 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
@@ -47,10 +47,10 @@
unsigned long cardinality, unsigned long size));
void **hash_find_slot __P((struct hash_table *ht, void const *key));
void *hash_find_item __P((struct hash_table *ht, void const *key));
-void *hash_insert __P((struct hash_table *ht, void *item));
-void *hash_insert_at __P((struct hash_table *ht, void *item, void const
*slot));
-void *hash_delete __P((struct hash_table *ht, void const *item));
-void *hash_delete_at __P((struct hash_table *ht, void const *slot));
+const void *hash_insert __P((struct hash_table *ht, void *item));
+const void *hash_insert_at __P((struct hash_table *ht, void *item, void const
*slot));
+const void *hash_delete __P((struct hash_table *ht, void const *item));
+const void *hash_delete_at __P((struct hash_table *ht, void const *slot));
void hash_delete_items __P((struct hash_table *ht));
void hash_free_items __P((struct hash_table *ht));
void hash_free __P((struct hash_table *ht, int free_items));
@@ -59,7 +59,8 @@
void **hash_dump __P((struct hash_table *ht, void **vector_0, qsort_cmp_t
compare));
extern void *hash_deleted_item;
-#define HASH_VACANT(item) ((item) == 0 || (void *) (item) == hash_deleted_item)
+#define HASH_VACANT(item) \
+ ((item) == 0 || (const void *) (item) == hash_deleted_item)
/* hash and comparison macros for string keys. */
Index: src/muscle_tab.c
--- src/muscle_tab.c Sat, 08 Dec 2001 13:39:27 +0100 akim
+++ src/muscle_tab.c Sat, 08 Dec 2001 14:03:14 +0100 akim
@@ -1,5 +1,5 @@
/* Macro table manager for Bison,
- Copyright 1984, 1989, 2000 Free Software Foundation, Inc.
+ Copyright 2001 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -32,19 +32,20 @@
static unsigned long
mhash1 (const void *item)
{
- return_STRING_HASH_1 (((muscle_entry_t *) item)->key);
+ return_STRING_HASH_1 (((const muscle_entry_t *) item)->key);
}
static unsigned long
mhash2 (const void *item)
{
- return_STRING_HASH_2 (((muscle_entry_t *) item)->key);
+ return_STRING_HASH_2 (((const muscle_entry_t *) item)->key);
}
static int
mcmp (const void *x, const void *y)
{
- return strcmp (((muscle_entry_t*) x)->key, ((muscle_entry_t *) y)->key);
+ return strcmp (((const muscle_entry_t*) x)->key,
+ ((const muscle_entry_t *) y)->key);
}
void
@@ -105,7 +106,7 @@
muscle_insert ("name", "Parser");
}
-void
+void
muscle_insert (const char *key, const char *value)
{
muscle_entry_t *pair = XMALLOC (muscle_entry_t, 1);
Index: src/options.h
--- src/options.h Sat, 08 Dec 2001 13:39:27 +0100 akim
+++ src/options.h Sat, 08 Dec 2001 14:02:40 +0100 akim
@@ -57,6 +57,6 @@
extern const struct option_table_struct option_table[];
/* Set the longopts variable from option_table. */
-void create_long_option_table PARAMS (());
+void create_long_option_table PARAMS ((void));
#endif /* !OPTIONS_H_ */
Index: src/reader.c
--- src/reader.c Sat, 08 Dec 2001 13:24:47 +0100 akim
+++ src/reader.c Sat, 08 Dec 2001 14:04:45 +0100 akim
@@ -966,7 +966,7 @@
/*---------------------------------.
-| Parse a double quoted parameter. |
+| Parse a double quoted parameter. |
`---------------------------------*/
static const char *
@@ -994,7 +994,7 @@
else
break;
}
-
+
obstack_1grow (¶m_obstack, '\0');
param = obstack_finish (¶m_obstack);
@@ -1014,7 +1014,7 @@
| Parse what comes after %skeleton. |
`----------------------------------*/
-void
+static void
parse_skel_decl (void)
{
skeleton = parse_dquoted_param ("%skeleton");
@@ -1133,7 +1133,6 @@
{
int c;
int count;
- char buf[4096];
/* offset is always 0 if parser has already popped the stack pointer */
if (semantic_parser)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 04-fyi-gcc-warnings.patch,
Akim Demaille <=