X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fnlm.c;h=ef1e428015fd69325be02333a61961de2f667f17;hb=0b31a4bcec2efec9bc8ca40deb61123c52690a2e;hp=89c6baa64ef72e2f1a435fb56dc53c15e5cc8f41;hpb=30727aa6d12fb866494020c0b62ab265a2bdcdfe;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/nlm.c b/bfd/nlm.c
index 89c6baa64e..ef1e428015 100644
--- a/bfd/nlm.c
+++ b/bfd/nlm.c
@@ -1,54 +1,54 @@
 /* NLM (NetWare Loadable Module) executable support for BFD.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993-2016 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "libnlm.h"
 
 /* Make an NLM object.  We just need to allocate the backend
    information.  */
 
-boolean
-nlm_mkobject (abfd)
-     bfd * abfd;
+bfd_boolean
+nlm_mkobject (bfd * abfd)
 {
-  nlm_tdata (abfd) =
-    (struct nlm_obj_tdata *) bfd_zalloc (abfd, sizeof (struct nlm_obj_tdata));
+  bfd_size_type amt = sizeof (struct nlm_obj_tdata);
+
+  nlm_tdata (abfd) = bfd_zalloc (abfd, amt);
   if (nlm_tdata (abfd) == NULL)
-    return (false);
+    return FALSE;
 
   if (nlm_architecture (abfd) != bfd_arch_unknown)
     bfd_default_set_arch_mach (abfd, nlm_architecture (abfd),
 			       nlm_machine (abfd));
 
-  /* since everything is done at close time, do we need any initialization? */
-  return (true);
+  /* Since everything is done at close time, do we need any initialization ?  */
+  return TRUE;
 }
 
 /* Set the architecture and machine for an NLM object.  */
 
-boolean
-nlm_set_arch_mach (abfd, arch, machine)
-     bfd * abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
+bfd_boolean
+nlm_set_arch_mach (bfd * abfd,
+		   enum bfd_architecture arch,
+		   unsigned long machine)
 {
   bfd_default_set_arch_mach (abfd, arch, machine);
   return arch == nlm_architecture (abfd);