about summary refs log tree commit diff
path: root/dirent
diff options
context:
space:
mode:
Diffstat (limited to 'dirent')
-rw-r--r--dirent/alphasort.c32
-rw-r--r--dirent/list.c57
2 files changed, 43 insertions, 46 deletions
diff --git a/dirent/alphasort.c b/dirent/alphasort.c
index a7bdf3820e..6c62380e99 100644
--- a/dirent/alphasort.c
+++ b/dirent/alphasort.c
@@ -1,28 +1,26 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1992, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library 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
-Library General Public License for more details.
+   The GNU C Library 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
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
 #include <dirent.h>
 #include <string.h>
 
 int
-DEFUN(alphasort, (a, b),
-      CONST PTR a AND CONST PTR b)
+alphasort (const void *a, const void *b)
 {
   return strcmp (((struct dirent *) a)->d_name,
 		 ((struct dirent *) b)->d_name);
diff --git a/dirent/list.c b/dirent/list.c
index 606bd42591..38f770f0ed 100644
--- a/dirent/list.c
+++ b/dirent/list.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1993, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library 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
-Library General Public License for more details.
+   The GNU C Library 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
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -25,44 +24,44 @@ Cambridge, MA 02139, USA.  */
 
 
 void
-DEFUN(test, (name), CONST char *name)
+test (const char *name)
 {
   DIR *dirp;
   struct dirent *entp;
 
-  puts(name);
+  puts (name);
 
-  dirp = opendir(name);
+  dirp = opendir (name);
   if (dirp == NULL)
     {
-      perror("opendir");
+      perror ("opendir");
       return;
     }
 
   errno = 0;
-  while ((entp = readdir(dirp)) != NULL)
-    printf("%s\tfile number %lu\n",
-	   entp->d_name, (unsigned long int) entp->d_fileno);
+  while ((entp = readdir (dirp)) != NULL)
+    printf ("%s\tfile number %lu\n",
+	    entp->d_name, (unsigned long int) entp->d_fileno);
 
   if (errno)
     perror ("readdir");
 
-  if (closedir(dirp) < 0)
-    perror("closedir");
+  if (closedir (dirp) < 0)
+    perror ("closedir");
 }
 
 int
-DEFUN(main, (argc, argv), int argc AND char **argv)
+main (int argc, char **argv)
 {
   --argc;
   ++argv;
 
   if (argc == 0)
-    test(".");
+    test (".");
   else
     while (argc-- > 0)
-      test(*argv++);
+      test (*argv++);
 
-  exit(0);
-  return(0);
+  exit (0);
+  return 0;
 }