X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Ffilemode.c;h=849ee7344f4de44176988d4ecc818b57ae41f222;hb=d3a49aa80b8a6eab1c684deddad3542c4cdaa497;hp=ca00694fb7820e84468f8121b5f381e851a9d00c;hpb=0af11b59ba54970f0d0ce598fdd99a73a9049716;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/filemode.c b/binutils/filemode.c
index ca00694fb7..849ee7344f 100644
--- a/binutils/filemode.c
+++ b/binutils/filemode.c
@@ -1,10 +1,9 @@
 /* filemode.c -- make a string describing file modes
-   Copyright 1985, 1990, 1991, 1994, 1995, 1997
-   Free Software Foundation, Inc.
+   Copyright (C) 1985-2017 Free Software Foundation, Inc.
 
    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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,14 +13,15 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
+#include "sysdep.h"
 #include "bfd.h"
 #include "bucomm.h"
 
-static char ftypelet PARAMS ((unsigned long));
-static void setst PARAMS ((unsigned long, char *));
+static char ftypelet (unsigned long);
+static void setst (unsigned long, char *);
 
 /* filemodestring - fill in string STR with an ls-style ASCII
    representation of the st_mode field of file stats block STATP.
@@ -59,20 +59,6 @@ static void setst PARAMS ((unsigned long, char *));
 	otherwise.
 	'T' if the file is sticky but not executable.  */
 
-#if 0
-
-/* This is not used; only mode_string is used.  */
-
-void
-filemodestring (statp, str)
-     struct stat *statp;
-     char *str;
-{
-  mode_string ((unsigned long) statp->st_mode, str);
-}
-
-#endif
-
 /* Get definitions for the file permission bits.  */
 
 #ifndef S_IRWXU
@@ -118,9 +104,7 @@ filemodestring (statp, str)
    is given as an argument.  */
 
 void
-mode_string (mode, str)
-     unsigned long mode;
-     char *str;
+mode_string (unsigned long mode, char *str)
 {
   str[0] = ftypelet ((unsigned long) mode);
   str[1] = (mode & S_IRUSR) != 0 ? 'r' : '-';
@@ -140,7 +124,7 @@ mode_string (mode, str)
    'd' for directories
    'b' for block special files
    'c' for character special files
-   'm' for multiplexor files
+   'm' for multiplexer files
    'l' for symbolic links
    's' for sockets
    'p' for fifos
@@ -195,8 +179,7 @@ mode_string (mode, str)
 #endif /* ! defined (S_ISLNK) */
 
 static char
-ftypelet (bits)
-     unsigned long bits;
+ftypelet (unsigned long bits)
 {
   if (S_ISDIR (bits))
     return 'd';
@@ -230,9 +213,7 @@ ftypelet (bits)
    according to the file mode BITS.  */
 
 static void
-setst (bits, chars)
-     unsigned long bits ATTRIBUTE_UNUSED;
-     char *chars ATTRIBUTE_UNUSED;
+setst (unsigned long bits ATTRIBUTE_UNUSED, char *chars ATTRIBUTE_UNUSED)
 {
 #ifdef S_ISUID
   if (bits & S_ISUID)