X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmodechange.c;h=90060778a73bed7e90cbcd7657456388e0deb35c;hb=8cdf507496138203fbf4c3f36c70575825ad7bf1;hp=e1212e90a3ce805a1ba545d9310d945e9ce86f4e;hpb=8dcddcc0e43ef50dac490a371163c695cf4c9323;p=gnulib.git

diff --git a/lib/modechange.c b/lib/modechange.c
index e1212e90a..90060778a 100644
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -12,8 +12,8 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by David MacKenzie <djm@ai.mit.edu> */
 
@@ -24,39 +24,30 @@
    changing the mode of many files, this probably results in a
    performance gain. */
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "modechange.h"
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
 #else
 char *malloc ();
 #endif
 
 #ifndef NULL
-#define NULL 0
+# define NULL 0
 #endif
 
-#ifdef	STAT_MACROS_BROKEN
-#ifdef S_ISDIR
-#undef S_ISDIR
-#endif
-#endif	/* STAT_MACROS_BROKEN.  */
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif /* STAT_MACROS_BROKEN.  */
 
 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 /* Return newly allocated memory to hold one element of type TYPE. */
@@ -81,7 +72,7 @@ static int oatoi ();
 
 struct mode_change *
 mode_compile (mode_string, masked_ops)
-     register char *mode_string;
+     const char *mode_string;
      unsigned masked_ops;
 {
   struct mode_change *head;	/* First element of the linked list. */
@@ -253,7 +244,7 @@ invalid:
 unsigned short
 mode_adjust (oldmode, changes)
      unsigned oldmode;
-     register struct mode_change *changes;
+     const struct mode_change *changes;
 {
   unsigned short newmode;	/* The adjusted mode and one operand. */
   unsigned short value;		/* The other operand. */