X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fdictionary.c;h=e1c2010bc1c386d46bf4d821b441a9982b10ec64;hb=e7fbb131d42983eec31231f8bb69cdd8d5a33ee6;hp=86ecb25ad99a403a671418552373854ebf5dd14b;hpb=a9762ec78a53fbe9209fe1654db42df0cd328d50;p=binutils-gdb.git

diff --git a/gdb/dictionary.c b/gdb/dictionary.c
index 86ecb25ad99..e1c2010bc1c 100644
--- a/gdb/dictionary.c
+++ b/gdb/dictionary.c
@@ -1,6 +1,6 @@
 /* Routines for name->symbol lookups in GDB.
    
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
    Inc.
@@ -287,7 +287,7 @@ static const struct dict_vector dict_hashed_vector =
     DICT_HASHED,			/* type */
     free_obstack,			/* free */
     add_symbol_nonexpandable,		/* add_symbol */
-    iterator_first_hashed,		/* iteractor_first */
+    iterator_first_hashed,		/* iterator_first */
     iterator_next_hashed,		/* iterator_next */
     iter_name_first_hashed,		/* iter_name_first */
     iter_name_next_hashed,		/* iter_name_next */
@@ -299,7 +299,7 @@ static const struct dict_vector dict_hashed_expandable_vector =
     DICT_HASHED_EXPANDABLE,		/* type */
     free_hashed_expandable,		/* free */
     add_symbol_hashed_expandable,	/* add_symbol */
-    iterator_first_hashed,		/* iteractor_first */
+    iterator_first_hashed,		/* iterator_first */
     iterator_next_hashed,		/* iterator_next */
     iter_name_first_hashed,		/* iter_name_first */
     iter_name_next_hashed,		/* iter_name_next */
@@ -311,7 +311,7 @@ static const struct dict_vector dict_linear_vector =
     DICT_LINEAR,			/* type */
     free_obstack,			/* free */
     add_symbol_nonexpandable,		/* add_symbol */
-    iterator_first_linear,		/* iteractor_first */
+    iterator_first_linear,		/* iterator_first */
     iterator_next_linear,		/* iterator_next */
     iter_name_first_linear,		/* iter_name_first */
     iter_name_next_linear,		/* iter_name_next */
@@ -323,7 +323,7 @@ static const struct dict_vector dict_linear_expandable_vector =
     DICT_LINEAR_EXPANDABLE,		/* type */
     free_linear_expandable,		/* free */
     add_symbol_linear_expandable,	/* add_symbol */
-    iterator_first_linear,		/* iteractor_first */
+    iterator_first_linear,		/* iterator_first */
     iterator_next_linear,		/* iterator_next */
     iter_name_first_linear,		/* iter_name_first */
     iter_name_next_linear,		/* iter_name_next */
@@ -578,7 +578,6 @@ iterator_first_hashed (const struct dictionary *dict,
 static struct symbol *
 iterator_next_hashed (struct dict_iterator *iterator)
 {
-  const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
   struct symbol *next;
 
   next = DICT_ITERATOR_CURRENT (iterator)->hash_next;
@@ -725,21 +724,24 @@ expand_hashtable (struct dictionary *dict)
   DICT_HASHED_NBUCKETS (dict) = new_nbuckets;
   DICT_HASHED_BUCKETS (dict) = new_buckets;
 
-  for (i = 0; i < old_nbuckets; ++i) {
-    struct symbol *sym, *next_sym;
-
-    sym = old_buckets[i];
-    if (sym != NULL) {
-      for (next_sym = sym->hash_next;
-	   next_sym != NULL;
-	   next_sym = sym->hash_next) {
-	insert_symbol_hashed (dict, sym);
-	sym = next_sym;
-      }
+  for (i = 0; i < old_nbuckets; ++i)
+    {
+      struct symbol *sym, *next_sym;
 
-      insert_symbol_hashed (dict, sym);
+      sym = old_buckets[i];
+      if (sym != NULL) 
+	{
+	  for (next_sym = sym->hash_next;
+	       next_sym != NULL;
+	       next_sym = sym->hash_next)
+	    {
+	      insert_symbol_hashed (dict, sym);
+	      sym = next_sym;
+	    }
+
+	  insert_symbol_hashed (dict, sym);
+	}
     }
-  }
 
   xfree (old_buckets);
 }
@@ -822,13 +824,14 @@ add_symbol_linear_expandable (struct dictionary *dict,
   int nsyms = ++DICT_LINEAR_NSYMS (dict);
 
   /* Do we have enough room?  If not, grow it.  */
-  if (nsyms > DICT_LINEAR_EXPANDABLE_CAPACITY (dict)) {
-    DICT_LINEAR_EXPANDABLE_CAPACITY (dict) *= 2;
-    DICT_LINEAR_SYMS (dict)
-      = xrealloc (DICT_LINEAR_SYMS (dict),
-		  DICT_LINEAR_EXPANDABLE_CAPACITY (dict)
-		  * sizeof (struct symbol *));
-  }
+  if (nsyms > DICT_LINEAR_EXPANDABLE_CAPACITY (dict))
+    {
+      DICT_LINEAR_EXPANDABLE_CAPACITY (dict) *= 2;
+      DICT_LINEAR_SYMS (dict)
+	= xrealloc (DICT_LINEAR_SYMS (dict),
+		    DICT_LINEAR_EXPANDABLE_CAPACITY (dict)
+		    * sizeof (struct symbol *));
+    }
 
   DICT_LINEAR_SYM (dict, nsyms - 1) = sym;
 }