X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fdwarf1.c;h=fbd0345f6ada68f1cd408afa500a2809a8471276;hb=233cc9c13af8e8182d0ce5b306526b59f5b11f37;hp=3c2cf797ed7ced39cc6061d9d53691b0bf5d43c9;hpb=ab1579fdafda42ee5c832f3c878b2093c1d72942;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/dwarf1.c b/bfd/dwarf1.c
index 3c2cf797ed..fbd0345f6a 100644
--- a/bfd/dwarf1.c
+++ b/bfd/dwarf1.c
@@ -1,6 +1,5 @@
 /* DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
-   Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
    Written by Gavin Romig-Koch of Cygnus Solutions (gavin@cygnus.com).
 
@@ -143,7 +142,7 @@ alloc_dwarf1_unit (struct dwarf1_debug* stash)
 {
   bfd_size_type amt = sizeof (struct dwarf1_unit);
 
-  struct dwarf1_unit* x = bfd_zalloc (stash->abfd, amt);
+  struct dwarf1_unit* x = (struct dwarf1_unit *) bfd_zalloc (stash->abfd, amt);
   if (x)
     {
       x->prev = stash->lastUnit;
@@ -161,7 +160,7 @@ alloc_dwarf1_func (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
 {
   bfd_size_type amt = sizeof (struct dwarf1_func);
 
-  struct dwarf1_func* x = bfd_zalloc (stash->abfd, amt);
+  struct dwarf1_func* x = (struct dwarf1_func *) bfd_zalloc (stash->abfd, amt);
   if (x)
     {
       x->prev = aUnit->func_list;
@@ -251,8 +250,8 @@ parse_die (bfd *             abfd,
 	  break;
 	case FORM_STRING:
 	  if (attr == AT_name)
-	    aDieInfo->name = (char *)xptr;
-	  xptr += strlen (aDieInfo->name) + 1;
+	    aDieInfo->name = (char *) xptr;
+	  xptr += strlen ((char *) xptr) + 1;
 	  break;
 	}
     }
@@ -312,7 +311,8 @@ parse_line_table (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
 
       /* Allocate an array for the entries.  */
       amt = sizeof (struct linenumber) * aUnit->line_count;
-      aUnit->linenumber_table = bfd_alloc (stash->abfd, amt);
+      aUnit->linenumber_table = (struct linenumber *) bfd_alloc (stash->abfd,
+                                                                 amt);
       if (!aUnit->linenumber_table)
 	return FALSE;
 
@@ -449,8 +449,8 @@ dwarf1_unit_find_nearest_line (struct dwarf1_debug* stash,
 
 bfd_boolean
 _bfd_dwarf1_find_nearest_line (bfd *abfd,
-			       asection *section,
 			       asymbol **symbols,
+			       asection *section,
 			       bfd_vma offset,
 			       const char **filename_ptr,
 			       const char **functionname_ptr,
@@ -473,7 +473,7 @@ _bfd_dwarf1_find_nearest_line (bfd *abfd,
       bfd_size_type size = sizeof (struct dwarf1_debug);
 
       stash = elf_tdata (abfd)->dwarf1_find_line_info
-	= bfd_zalloc (abfd, size);
+	= (struct dwarf1_debug *) bfd_zalloc (abfd, size);
 
       if (! stash)
 	return FALSE;