summaryrefslogtreecommitdiff
path: root/read.c
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@kolpackov.net>2009-10-06 12:36:29 +0000
committerBoris Kolpackov <boris@kolpackov.net>2009-10-06 12:36:29 +0000
commitbd2d124f275cec912d33ec1463ba66e799518340 (patch)
tree001ad6cbe5778e036c188bc67008efa2bf182af5 /read.c
parent4254e88cfa7704ea4a55d94a9aee5b19b081b3db (diff)
downloadgunmake-bd2d124f275cec912d33ec1463ba66e799518340.tar.gz
Fix savannah bug 25780. Optimize things a bit.
Diffstat (limited to 'read.c')
-rw-r--r--read.c64
1 files changed, 0 insertions, 64 deletions
diff --git a/read.c b/read.c
index a86f791..3a022d6 100644
--- a/read.c
+++ b/read.c
@@ -1723,71 +1723,7 @@ conditional_line (char *line, int len, const struct floc *flocp)
return 0;
}
-/* Remove duplicate dependencies in CHAIN. */
-static unsigned long
-dep_hash_1 (const void *key)
-{
- return_STRING_HASH_1 (dep_name ((struct dep const *) key));
-}
-
-static unsigned long
-dep_hash_2 (const void *key)
-{
- return_STRING_HASH_2 (dep_name ((struct dep const *) key));
-}
-
-static int
-dep_hash_cmp (const void *x, const void *y)
-{
- struct dep *dx = (struct dep *) x;
- struct dep *dy = (struct dep *) y;
- int cmp = strcmp (dep_name (dx), dep_name (dy));
-
- /* If the names are the same but ignore_mtimes are not equal, one of these
- is an order-only prerequisite and one isn't. That means that we should
- remove the one that isn't and keep the one that is. */
-
- if (!cmp && dx->ignore_mtime != dy->ignore_mtime)
- dx->ignore_mtime = dy->ignore_mtime = 0;
-
- return cmp;
-}
-
-
-void
-uniquize_deps (struct dep *chain)
-{
- struct hash_table deps;
- register struct dep **depp;
-
- hash_init (&deps, 500, dep_hash_1, dep_hash_2, dep_hash_cmp);
-
- /* Make sure that no dependencies are repeated. This does not
- really matter for the purpose of updating targets, but it
- might make some names be listed twice for $^ and $?. */
-
- depp = &chain;
- while (*depp)
- {
- struct dep *dep = *depp;
- struct dep **dep_slot = (struct dep **) hash_find_slot (&deps, dep);
- if (HASH_VACANT (*dep_slot))
- {
- hash_insert_at (&deps, dep, dep_slot);
- depp = &dep->next;
- }
- else
- {
- /* Don't bother freeing duplicates.
- It's dangerous and little benefit accrues. */
- *depp = dep->next;
- }
- }
-
- hash_free (&deps, 0);
-}
-
/* Record target-specific variable values for files FILENAMES.
TWO_COLON is nonzero if a double colon was used.