diff options
Diffstat (limited to 'bin/ls/ls.c')
| -rw-r--r-- | bin/ls/ls.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 17eb81dec44..0e3ce3c9682 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.19 2003/06/02 23:32:08 millert Exp $ */ +/* $OpenBSD: ls.c,v 1.20 2003/06/11 23:42:12 deraadt Exp $ */ /* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */ /* @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94"; #else -static char rcsid[] = "$OpenBSD: ls.c,v 1.19 2003/06/02 23:32:08 millert Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.20 2003/06/11 23:42:12 deraadt Exp $"; #endif #endif /* not lint */ @@ -108,9 +108,7 @@ int f_whiteout; /* show whiteout entries */ int rval; int -ls_main(argc, argv) - int argc; - char *argv[]; +ls_main(int argc, char *argv[]) { static char dot[] = ".", *dotav[] = { dot, NULL }; struct winsize win; @@ -338,9 +336,7 @@ static int output; /* If anything output. */ * a superset (may be exact set) of the files to be displayed. */ static void -traverse(argc, argv, options) - int argc, options; - char *argv[]; +traverse(int argc, char *argv[], int options) { FTS *ftsp; FTSENT *p, *chp; @@ -404,8 +400,7 @@ traverse(argc, argv, options) * points to the parent directory of the display list. */ static void -display(p, list) - FTSENT *p, *list; +display(FTSENT *p, FTSENT *list) { struct stat *sp; DISPLAY d; @@ -560,8 +555,7 @@ display(p, list) * All other levels use the sort function. Error entries remain unsorted. */ static int -mastercmp(a, b) - const FTSENT **a, **b; +mastercmp(const FTSENT **a, const FTSENT **b) { int a_info, b_info; |