X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fhash.c;h=56d18ac317945a8bdd2d17166cf32e7ec0c595bf;hb=6f6fd151cbf226bbaa66e44977f57b7c6dc33d89;hp=4149474ffff3558f2bb081f9e22619119d817484;hpb=d495ab0d843def702a6641fa4fc31708d7fc97b1;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/hash.c b/bfd/hash.c
index 4149474fff..56d18ac317 100644
--- a/bfd/hash.c
+++ b/bfd/hash.c
@@ -1,5 +1,5 @@
 /* hash.c -- hash table routines for BFD
-   Copyright (C) 1993-2014 Free Software Foundation, Inc.
+   Copyright (C) 1993-2020 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -231,8 +231,8 @@ EXAMPLE
 
 .struct bfd_hash_entry *
 .@var{function_name} (struct bfd_hash_entry *entry,
-.                     struct bfd_hash_table *table,
-.                     const char *string)
+.		      struct bfd_hash_table *table,
+.		      const char *string)
 .{
 .  struct @var{entry_type} *ret = (@var{entry_type} *) entry;
 .
@@ -242,12 +242,12 @@ EXAMPLE
 .    {
 .      ret = bfd_hash_allocate (table, sizeof (* ret));
 .      if (ret == NULL)
-.        return NULL;
+.	 return NULL;
 .    }
 .
 . {* Call the allocation method of the base class.  *}
 .  ret = ((@var{entry_type} *)
-.	 @var{base_newfunc} ((struct bfd_hash_entry *) ret, table, string));
+.	  @var{base_newfunc} ((struct bfd_hash_entry *) ret, table, string));
 .
 . {* Initialize the local fields here.  *}
 .
@@ -435,6 +435,7 @@ bfd_hash_hash (const char *string, unsigned int *lenp)
   unsigned int len;
   unsigned int c;
 
+  BFD_ASSERT (string != NULL);
   hash = 0;
   len = 0;
   s = (const unsigned char *) string;
@@ -483,7 +484,7 @@ bfd_hash_lookup (struct bfd_hash_table *table,
       char *new_string;
 
       new_string = (char *) objalloc_alloc ((struct objalloc *) table->memory,
-                                            len + 1);
+					    len + 1);
       if (!new_string)
 	{
 	  bfd_set_error (bfd_error_no_memory);
@@ -634,7 +635,7 @@ bfd_hash_newfunc (struct bfd_hash_entry *entry,
 {
   if (entry == NULL)
     entry = (struct bfd_hash_entry *) bfd_hash_allocate (table,
-                                                         sizeof (* entry));
+							 sizeof (* entry));
   return entry;
 }
 
@@ -731,7 +732,7 @@ strtab_hash_newfunc (struct bfd_hash_entry *entry,
      subclass.  */
   if (ret == NULL)
     ret = (struct strtab_hash_entry *) bfd_hash_allocate (table,
-                                                          sizeof (* ret));
+							  sizeof (* ret));
   if (ret == NULL)
     return NULL;
 
@@ -761,7 +762,7 @@ struct bfd_strtab_hash *
 _bfd_stringtab_init (void)
 {
   struct bfd_strtab_hash *table;
-  bfd_size_type amt = sizeof (* table);
+  size_t amt = sizeof (* table);
 
   table = (struct bfd_strtab_hash *) bfd_malloc (amt);
   if (table == NULL)
@@ -828,7 +829,7 @@ _bfd_stringtab_add (struct bfd_strtab_hash *tab,
   else
     {
       entry = (struct strtab_hash_entry *) bfd_hash_allocate (&tab->table,
-                                                              sizeof (* entry));
+							      sizeof (* entry));
       if (entry == NULL)
 	return (bfd_size_type) -1;
       if (! copy)
@@ -841,7 +842,7 @@ _bfd_stringtab_add (struct bfd_strtab_hash *tab,
 	  n = (char *) bfd_hash_allocate (&tab->table, len);
 	  if (n == NULL)
 	    return (bfd_size_type) -1;
-          memcpy (n, str, len);
+	  memcpy (n, str, len);
 	  entry->root.string = n;
 	}
       entry->index = (bfd_size_type) -1;